hfp: create modem for new devices paired on runtime

It listens the UUIDs property to create a modem from the recently paired
devices. It also renames added_watch to adapter_watch, a more proper
name.

diff --git a/plugins/hfp.c b/plugins/hfp.c
index 51f1d9a..ee0c073 100644 (file)
--- 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)
 {
@@ -427,6 +428,7 @@ static int hfp_create_modem(const char *device)
 {
        struct ofono_modem *modem;
        struct hfp_data *data;
+       const char *path;
 
        ofono_info("Using device: %s", device);
 
@@ -451,6 +453,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:
@@ -465,6 +470,9 @@ static void parse_uuids(DBusMessageIter *i, const char *device)
        DBusMessageIter variant, ai;
        const char *value;
 
+       if (g_hash_table_lookup(uuid_hash, device))
+               return;
+
        dbus_message_iter_recurse(i, &variant);
        dbus_message_iter_recurse(&variant, &ai);
 
@@ -624,6 +632,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 +760,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 +835,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 +847,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 +875,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,9 +886,12 @@ 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);
 
        ofono_modem_driver_unregister(&hfp_driver);
+
+       g_hash_table_destroy(uuid_hash);
 }
 
 OFONO_PLUGIN_DEFINE(hfp, "Hands-Free Profile Plugins", VERSION,