diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2012-12-18 17:06:12 +0100 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2012-12-18 17:06:12 +0100 |
commit | e2871fd827a33a4aa7a27b144fb92917f888277e (patch) | |
tree | 27408856564dbb2677982d0c02556e8e034d1795 /client/agent.c | |
parent | d3e632630538c4949d5a4c01428603d6b985986f (diff) | |
download | bluez-e2871fd827a33a4aa7a27b144fb92917f888277e.tar.gz |
client: Handle legacy pairing and input of PIN codes
Diffstat (limited to 'client/agent.c')
-rw-r--r-- | client/agent.c | 53 |
1 files changed, 46 insertions, 7 deletions
diff --git a/client/agent.c b/client/agent.c index 6683cce72..13bada6d0 100644 --- a/client/agent.c +++ b/client/agent.c @@ -46,13 +46,14 @@ dbus_bool_t agent_completion(void) return TRUE; } -dbus_bool_t agent_input(DBusConnection *conn, const char *input) +static void pincode_response(DBusConnection *conn, const char *input) { - rl_clear_message(); - - if (!pending_message) - return FALSE; + g_dbus_send_reply(conn, pending_message, DBUS_TYPE_STRING, &input, + DBUS_TYPE_INVALID); +} +static void confirm_response(DBusConnection *conn, const char *input) +{ if (!strcmp(input, "yes")) g_dbus_send_reply(conn, pending_message, DBUS_TYPE_INVALID); else if (!strcmp(input, "no")) @@ -61,8 +62,26 @@ dbus_bool_t agent_input(DBusConnection *conn, const char *input) else g_dbus_send_error(conn, pending_message, "org.bluez.Error.Canceled", NULL); +} - g_dbus_send_reply(conn, pending_message, DBUS_TYPE_INVALID); +dbus_bool_t agent_input(DBusConnection *conn, const char *input) +{ + const char *member; + + rl_clear_message(); + + if (!pending_message) + return FALSE; + + member = dbus_message_get_member(pending_message); + + if (!strcmp(member, "RequestPinCode")) + pincode_response(conn, input); + else if (!strcmp(member, "RequestConfirmation")) + confirm_response(conn, input); + else + g_dbus_send_error(conn, pending_message, + "org.bluez.Error.Canceled", NULL); dbus_message_unref(pending_message); pending_message = NULL; @@ -90,6 +109,23 @@ static DBusMessage *release_agent(DBusConnection *conn, return dbus_message_new_method_return(msg); } +static DBusMessage *request_pincode(DBusConnection *conn, + DBusMessage *msg, void *user_data) +{ + const char *device; + + rl_printf("Request PIN code\n"); + + dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &device, + DBUS_TYPE_INVALID); + + rl_message("Enter PIN code: "); + + pending_message = dbus_message_ref(msg); + + return NULL; +} + static DBusMessage *request_confirmation(DBusConnection *conn, DBusMessage *msg, void *user_data) { @@ -126,8 +162,11 @@ static DBusMessage *cancel_request(DBusConnection *conn, static const GDBusMethodTable methods[] = { { GDBUS_METHOD("Release", NULL, NULL, release_agent) }, + { GDBUS_ASYNC_METHOD("RequestPinCode", + GDBUS_ARGS({ "device", "o" }), + GDBUS_ARGS({ "pincode", "s" }), request_pincode) }, { GDBUS_ASYNC_METHOD("RequestConfirmation", - GDBUS_ARGS({ "device", "o"}, { "passkey", "u" }), + GDBUS_ARGS({ "device", "o" }, { "passkey", "u" }), NULL, request_confirmation) }, { GDBUS_METHOD("Cancel", NULL, NULL, cancel_request) }, { } |