It listens the Paired property to create a modem to the recently paired devices. It also renames added_watch to adapter_watch, a more proper name. --- plugins/hfp.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 59 insertions(+), 5 deletions(-) diff --git a/plugins/hfp.c b/plugins/hfp.c index 981b05b..cd43af7 100644 --- a/plugins/hfp.c +++ b/plugins/hfp.c @@ -66,6 +66,7 @@ static const char *cmer_prefix[] = { "+CMER:", NULL }; static const char *chld_prefix[] = { "+CHLD:", NULL }; static DBusConnection *connection; +static GHashTable *uuid_hash = NULL; static void hfp_debug(const char *str, void *user_data) { @@ -410,6 +411,9 @@ static DBusMessage *hfp_agent_release(DBusConnection *conn, DBusMessage *msg, void *data) { struct ofono_modem *modem = data; + const char * path; + + path = dbus_message_get_path(msg); ofono_modem_remove(modem); @@ -427,6 +431,10 @@ static int hfp_create_modem(const char *device) { struct ofono_modem *modem; struct hfp_data *data; + const char *path; + + if (g_hash_table_lookup(uuid_hash, device)) + return -EALREADY; ofono_info("Using device: %s", device); @@ -451,6 +459,9 @@ static int hfp_create_modem(const char *device) ofono_modem_set_data(modem, data); ofono_modem_register(modem); + path = ofono_modem_get_path(modem); + g_hash_table_insert(uuid_hash, g_strdup(device), g_strdup(path)); + return 0; free: @@ -624,6 +635,33 @@ static gboolean adapter_added(DBusConnection *connection, DBusMessage *message, return TRUE; } +static gboolean uuid_emitted(DBusConnection *connection, DBusMessage *message, + void *user_data) +{ + const char *device, *property; + DBusMessageIter iter; + + dbus_message_iter_init(message, &iter); + + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING) + return FALSE; + + dbus_message_iter_get_basic(&iter, &property); + if (g_str_equal(property, "UUIDs") == FALSE) + return TRUE; + + if (!dbus_message_iter_next(&iter)) + return FALSE; + + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT) + return FALSE; + + device = dbus_message_get_path(message); + parse_uuids(&iter, device); + + return TRUE; +} + static void list_adapters_cb(DBusPendingCall *call, gpointer user_data) { DBusError err; @@ -725,6 +763,8 @@ static void hfp_remove(struct ofono_modem *modem) hfp_unregister_ofono_handsfree(modem); + g_hash_table_remove(uuid_hash, data->handsfree_path); + g_free(data->handsfree_path); g_free(data); @@ -798,7 +838,8 @@ static struct ofono_modem_driver hfp_driver = { .post_sim = hfp_post_sim, }; -static guint added_watch; +static guint adapter_watch; +static guint uuid_watch; static int hfp_init(void) { @@ -809,12 +850,21 @@ static int hfp_init(void) connection = ofono_dbus_get_connection(); - added_watch = g_dbus_add_signal_watch(connection, NULL, NULL, + adapter_watch = g_dbus_add_signal_watch(connection, NULL, NULL, BLUEZ_MANAGER_INTERFACE, "AdapterAdded", adapter_added, NULL, NULL); - if (added_watch == 0) { + uuid_watch = g_dbus_add_signal_watch(connection, NULL, NULL, + BLUEZ_DEVICE_INTERFACE, + "PropertyChanged", + uuid_emitted, NULL, NULL); + + + uuid_hash = g_hash_table_new_full(g_str_hash, g_str_equal, + g_free, g_free); + + if (adapter_watch == 0 || uuid_watch == 0) { err = -EIO; goto remove; } @@ -828,7 +878,9 @@ static int hfp_init(void) return 0; remove: - g_dbus_remove_watch(connection, added_watch); + g_dbus_remove_watch(connection, adapter_watch); + g_dbus_remove_watch(connection, uuid_watch); + g_hash_table_destroy(uuid_hash); dbus_connection_unref(connection); @@ -837,7 +889,9 @@ remove: static void hfp_exit(void) { - g_dbus_remove_watch(connection, added_watch); + g_dbus_remove_watch(connection, adapter_watch); + g_dbus_remove_watch(connection, uuid_watch); + g_hash_table_destroy(uuid_hash); ofono_modem_driver_unregister(&hfp_driver); } -- 1.6.4.4