--- plugins/bluetooth.c | 136 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 127 insertions(+), 9 deletions(-)
diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c index 86d4c25..7e4dbc1 100644 --- a/plugins/bluetooth.c +++ b/plugins/bluetooth.c @@ -44,6 +44,8 @@ static GSList *adapter_list = NULL; static gint bluetooth_refcount; static GSList *server_list = NULL; +#define TIMEOUT (60*1000) /* Timeout for user response (milliseconds) */ + struct adapter_address { char *adapter; char *address; @@ -63,6 +65,7 @@ struct cb_data { struct server *server; char *path; guint source; + GIOChannel *io; }; void bluetooth_create_path(const char *dev_addr, const char *adapter_addr, @@ -266,6 +269,14 @@ static gint adapter_compare(gconstpointer a, gconstpointer b) return g_strcmp0(entry->adapter, key); } +static gint address_compare(gconstpointer a, gconstpointer b) +{ + const struct adapter_address *entry = a; + const char *key = b; + + return g_strcmp0(entry->address, key); +} + static GSList* adapter_address_add(GSList *list, const char *path, const char *address) { @@ -507,13 +518,102 @@ static gboolean client_event(GIOChannel *chan, GIOCondition cond, gpointer data) return FALSE; } +static void cancel_authorization(struct cb_data *user_data) +{ + DBusMessage *msg; + + if (user_data->path == NULL) + return; + + msg = dbus_message_new_method_call(BLUEZ_SERVICE, user_data->path, + BLUEZ_SERVICE_INTERFACE, + "CancelAuthorization"); + + g_dbus_send_message(connection, msg); +} + +static void auth_cb(DBusPendingCall *call, gpointer user_data) +{ + struct cb_data *cb_data = user_data; + struct server *server = cb_data->server; + + DBusMessage *reply = dbus_pending_call_steal_reply(call); + DBusError derr; + GError *err = NULL; + + dbus_error_init(&derr); + + if (dbus_set_error_from_message(&derr, reply)) { + ofono_error("RequestAuthorization error: %s, %s", + derr.name, derr.message); + + if (dbus_error_has_name(&derr, DBUS_ERROR_NO_REPLY)) + cancel_authorization(cb_data); + + dbus_error_free(&derr); + + dbus_message_unref(reply); + + goto failed; + } + + dbus_message_unref(reply); + + ofono_info("RequestAuthorization succeeded"); + + if (!bt_io_accept(cb_data->io, server->connect_cb, server->user_data, + NULL, &err)) { + ofono_error("%s", err->message); + g_error_free(err); + goto failed; + } + + g_source_remove(cb_data->source); + server->client_list = g_slist_remove(server->client_list, + (void *) cb_data->source); + + cb_data->source = g_io_add_watch(cb_data->io, + G_IO_HUP | G_IO_ERR | G_IO_NVAL, + client_event, cb_data); + server->client_list = g_slist_prepend(server->client_list, + (void *)cb_data->source); + + return; + +failed: + g_source_remove(cb_data->source); + server->client_list = g_slist_remove(server->client_list, + (void *) cb_data->source); + + cb_data_destroy(cb_data); +} + +static gboolean auth_watch(GIOChannel *io, GIOCondition cond, + gpointer user_data) +{ + struct cb_data *cb_data = user_data; + struct server *server = cb_data->server; + + cancel_authorization(cb_data); + server->client_list = g_slist_remove(server->client_list, + (void *) cb_data->source); + + cb_data_destroy(cb_data); + + return FALSE; +} + static void confirm_event(GIOChannel *io, gpointer user_data) { struct server *server = user_data; struct cb_data *client_data; + guint handle; + const char *addr; + int ret; GError *err = NULL; char laddress[18], raddress[18]; guint8 channel; + GSList *entry; bt_io_get(io, BT_IO_RFCOMM, &err, BT_IO_OPT_SOURCE, laddress, BT_IO_OPT_DEST, raddress, @@ -528,14 +628,6 @@ static void confirm_event(GIOChannel *io, gpointer user_data) ofono_info("New connection for %s on channel %u from: %s,", laddress, channel, raddress); - if (!bt_io_accept(io, server->connect_cb, server->user_data, - NULL, &err)) { - ofono_error("%s", err->message); - g_error_free(err); - g_io_channel_unref(io); - return; - } - client_data = g_try_new0(struct cb_data, 1); if (client_data == NULL) { ofono_error("Unable to allocate client cb_data structure"); @@ -543,9 +635,35 @@ static void confirm_event(GIOChannel *io, gpointer user_data) } client_data->server = server; + entry = g_slist_find_custom(adapter_list, laddress, address_compare); + if (entry != NULL) { + struct adapter_address *a = entry->data; + + client_data->path = g_strdup(a->adapter); + } + + client_data->io = io; + + handle = (guint) g_hash_table_lookup(server->adapter_hash, + client_data->path); + addr = raddress; + ret = bluetooth_send_with_reply(client_data->path, + BLUEZ_SERVICE_INTERFACE, + "RequestAuthorization", + auth_cb, client_data, NULL, TIMEOUT, + DBUS_TYPE_STRING, &addr, + DBUS_TYPE_UINT32, &handle, + DBUS_TYPE_INVALID); + if (ret < 0) { + ofono_error("Request Bluetooth authorization failed"); + return; + } + + ofono_info("RequestAuthorization(%s, 0x%x)", raddress, handle); + client_data->source = g_io_add_watch(io, G_IO_HUP | G_IO_ERR | G_IO_NVAL, - client_event, client_data); + auth_watch, client_data); server->client_list = g_slist_prepend(server->client_list, (void *)client_data->source); } -- 1.7.1 _______________________________________________ ofono mailing list ofono@ofono.org http://lists.ofono.org/listinfo/ofono