[PATCH 6/6] hfp_ag_bluez5: Remove emulator when disconnect

[Paulo Borges]

---
 plugins/hfp_ag_bluez5.c |   43 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/plugins/hfp_ag_bluez5.c b/plugins/hfp_ag_bluez5.c
index 2046e7d..0301fdb 100644
--- a/plugins/hfp_ag_bluez5.c
+++ b/plugins/hfp_ag_bluez5.c
@@ -65,11 +65,21 @@ static gboolean emulator_remove(gpointer key, gpointer 
value,
        return TRUE;
 }
 
+static void emulator_removed_cb(void *user_data)
+{
+       char *device = user_data;
+
+       DBG("%s", device);
+
+       g_hash_table_remove(emulator_hash, device);
+}
+
 static DBusMessage *profile_new_connection(DBusConnection *conn,
                                                DBusMessage *msg, void *data)
 {
        DBusMessageIter entry;
        const char *device;
+       char *key;
        int fd;
        struct ofono_emulator *em;
        struct ofono_modem *modem;
@@ -115,8 +125,11 @@ static DBusMessage *profile_new_connection(DBusConnection 
*conn,
                                                "Not enough resources");
        }
 
+       key = g_strdup(device);
+
        ofono_emulator_register(em, fd);
-       g_hash_table_insert(emulator_hash, g_strdup(device), em);
+       ofono_emulator_set_removed_cb(em, emulator_removed_cb, key);
+       g_hash_table_insert(emulator_hash, key, em);
 
        return dbus_message_new_method_return(msg);
 
@@ -148,11 +161,33 @@ static DBusMessage *profile_cancel(DBusConnection *conn,
 static DBusMessage *profile_disconnection(DBusConnection *conn,
                                        DBusMessage *msg, void *user_data)
 {
+       DBusMessageIter iter;
+       const char *device;
+       struct ofono_emulator *em;
+
        DBG("Profile handler RequestDisconnection");
 
-       return g_dbus_create_error(msg, BLUEZ_ERROR_INTERFACE
-                                       ".NotImplemented",
-                                       "Implementation not provided");
+       if (!dbus_message_iter_init(msg, &iter))
+               goto invalid;
+
+       if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_OBJECT_PATH)
+               goto invalid;
+
+       dbus_message_iter_get_basic(&iter, &device);
+
+       DBG("%s", device);
+
+       em = g_hash_table_lookup(emulator_hash, device);
+       if (em == NULL)
+               goto invalid;
+
+       ofono_emulator_remove(em);
+
+       return dbus_message_new_method_return(msg);
+
+invalid:
+       return g_dbus_create_error(msg, BLUEZ_ERROR_INTERFACE ".Rejected",
+                                       "Invalid arguments in method call");
 }
 
 static const GDBusMethodTable profile_methods[] = {
-- 
1.7.9.5

_______________________________________________
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono