From 43d88387413875f41b491545372c3086e9659fbe Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Wed, 24 Jan 2007 23:17:17 +0000 Subject: Add some debug prints to the authorize process --- hcid/dbus-database.c | 2 ++ hcid/dbus-security.c | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/hcid/dbus-database.c b/hcid/dbus-database.c index 1d10be6e..90175592 100644 --- a/hcid/dbus-database.c +++ b/hcid/dbus-database.c @@ -332,6 +332,8 @@ static DBusHandlerResult request_authorization(DBusConnection *conn, const char *sender, *address, *path; struct service *service; + debug("RequestAuthorization"); + if (!hcid_dbus_use_experimental()) return error_unknown_method(conn, msg); diff --git a/hcid/dbus-security.c b/hcid/dbus-security.c index 539d6d9e..9db66bee 100644 --- a/hcid/dbus-security.c +++ b/hcid/dbus-security.c @@ -679,6 +679,8 @@ static void auth_agent_req_reply(DBusPendingCall *call, void *data) DBusMessage *message; DBusError err; + debug("authorize reply"); + dbus_error_init(&err); if (dbus_set_error_from_message(&err, reply)) { if (strcmp(err.name, DBUS_ERROR_NO_REPLY) == 0) @@ -703,6 +705,8 @@ static void auth_agent_req_reply(DBusPendingCall *call, void *data) send_message_and_unref(agent->conn, message); + debug("successfull reply was sent"); + goto done; reject: @@ -714,6 +718,8 @@ done: agent->pending_requests = g_slist_remove(agent->pending_requests, req); auth_agent_req_free(req); + + debug("auth_agent_reply: returning"); } static DBusPendingCall *auth_agent_call_authorize(struct authorization_agent *agent, @@ -790,8 +796,12 @@ DBusHandlerResult handle_authorize_request(DBusConnection *conn, bdaddr_t bdaddr; int adapter_id; - if (!default_auth_agent) + debug("handle_authorize_request"); + + if (!default_auth_agent) { + debug("no default agent"); return error_auth_agent_does_not_exist(conn, msg); + } str2ba(address, &bdaddr); @@ -799,6 +809,8 @@ DBusHandlerResult handle_authorize_request(DBusConnection *conn, if (adapter_id < 0) return error_not_connected(conn, msg); + debug("Found %s connected to hci%d", address, adapter_id); + snprintf(adapter_path, sizeof(adapter_path), "/org/bluez/hci%d", adapter_id); @@ -818,6 +830,8 @@ DBusHandlerResult handle_authorize_request(DBusConnection *conn, default_agent->pending_requests = g_slist_append(default_agent->pending_requests, req); + debug("authorize request was forwarded"); + return DBUS_HANDLER_RESULT_HANDLED; } -- cgit