ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "adbd_auth function signature changes."

Browse source
This commit is contained in:
Joshua Duong 2020-02-21 21:02:33 +00:00 • committed by Gerrit Code Review
commit d62c817cce
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
adb/daemon/auth.cpp
View file

@ -85,8 +85,8 @@ static atransport* transport_from_callback_arg(void* id) {
static void IteratePublicKeys(std::function<bool(std::string_view public_key)> f) { static void IteratePublicKeys(std::function<bool(std::string_view public_key)> f) {
adbd_auth_get_public_keys( adbd_auth_get_public_keys(
auth_ctx, auth_ctx,
[](const char* public_key, size_t len, void* arg) { [](void* opaque, const char* public_key, size_t len) {
return (*static_cast<decltype(f)*>(arg))(std::string_view(public_key, len)); return (*static_cast<decltype(f)*>(opaque))(std::string_view(public_key, len));
}, },
&f); &f);
} }
@ -160,9 +160,9 @@ static void adbd_auth_key_authorized(void* arg, uint64_t id) {
} }
void adbd_auth_init(void) { void adbd_auth_init(void) {
AdbdAuthCallbacks cb; AdbdAuthCallbacksV1 cb;
cb.version = 1; cb.version = 1;
cb.callbacks.v1.key_authorized = adbd_auth_key_authorized; cb.key_authorized = adbd_auth_key_authorized;
auth_ctx = adbd_auth_new(&cb); auth_ctx = adbd_auth_new(&cb);
std::thread([]() { std::thread([]() {
adb_thread_setname("adbd auth"); adb_thread_setname("adbd auth");