agent: Detect when ongoing request is already in progress
Luiz Augusto von Dentz
maintainerPATCH 1/1 agent: Detect when ongoing request is already in progress
From: Luiz Augusto von Dentz <[email protected]>
This detects when a agent request is already pending for the same device which could happen when there are 2 or more adapters in the system and they are trying to pair with each other.
--- src/adapter.c | 5 +- src/agent.c | 128 ++++++++++++++++++++++++++++++++------------------ src/agent.h | 2 +- src/device.c | 12 +++++ 4 files changed, 97 insertions(+), 50 deletions(-)
src/adapter.c +1 -4
@@ -6454,7 +6454,6 @@ static gboolean process_auth_queue(gpointer user_data)while (!g_queue_is_empty (adapter->auths)) {struct service_auth *auth = adapter->auths->head->data;struct btd_device *device = auth->device; -const char *dev_path;/* Wait services to be resolved before asking authorization */ if (auth->svc_id >0 )
@@ -6477,9 +6476,7 @@ static gboolean process_auth_queue(gpointer user_data) goto next; } - dev_path =device_get_path (device); - -if (agent_authorize_service (auth->agent, dev_path, auth->uuid, +if (agent_authorize_service (auth->agent, device, auth->uuid, agent_auth_cb, adapter,NULL ) <0 ) { auth->cb (&err, auth->user_data); goto next;
src/agent.c +83 -45
328 lines not on this page · raw message
src/agent.h +1 -1
@@ -45,7 +45,7 @@ void agent_unref(struct agent *agent);struct agent *agent_get (const char *owner); -int agent_authorize_service (struct agent *agent,const char *path, +int agent_authorize_service (struct agent *agent,struct btd_device *device,const char *uuid,agent_cb cb,void *user_data,GDestroyNotify destroy);
src/device.c +12 -0
@@ -6166,6 +6166,12 @@ int device_confirm_passkey(struct btd_device *device, uint8_t type, confirm_cb, auth, NULL);if (err <0 ) { +if (err == -EINPROGRESS ) { +/* Already in progress */ +confirm_cb (auth->agent,NULL , auth); +return 0 ; + } +error ("Failed requesting authentication" );device_auth_req_free (device); }
@@ -6213,6 +6219,12 @@ int device_notify_pincode(struct btd_device *device, gboolean secure, err =agent_display_pincode (auth->agent, device, pincode, display_pincode_cb, auth,NULL );if (err <0 ) { +if (err == -EINPROGRESS ) { +/* Already in progress */ +display_pincode_cb (auth->agent,NULL , auth); +return 0 ; + } +error ("Failed requesting authentication" );device_auth_req_free (device); }
Signature · 1 line
2.21.0