plugins/admin: add adapter_remove handler

Currently admin doesn't handle adapter removed callbacks, which causes
interfaces AdminPolicySet1 and AdminPolicyStatus1 not being
unregistered, which in turns causes these interfaces can not be
re-registered once adapter is back.

This adds handler for adapter_remove.

Reviewed-by: Shyh-In Hwang <josephsih@chromium.org>
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
Signed-off-by: Anuj Jain <anuj01.jain@samsung.com>
Signed-off-by: Ayush Garg <ayush.garg@samsung.com>

diff --git a/plugins/admin.c b/plugins/admin.c
index 02fec04..0018501 100644 (file)
--- a/plugins/admin.c
+++ b/plugins/admin.c
@@ -85,6 +85,17 @@ static void admin_policy_free(void *data)
        g_free(admin_policy);
 }
 
+static void admin_policy_destroy(struct btd_admin_policy *admin_policy)
+{
+       const char *path = adapter_get_path(admin_policy->adapter);
+
+       g_dbus_unregister_interface(dbus_conn, path,
+                                               ADMIN_POLICY_SET_INTERFACE);
+       g_dbus_unregister_interface(dbus_conn, path,
+                                               ADMIN_POLICY_STATUS_INTERFACE);
+       admin_policy_free(admin_policy);
+}
+
 static bool uuid_match(const void *data, const void *match_data)
 {
        const bt_uuid_t *uuid = data;
@@ -492,7 +503,7 @@ static int admin_policy_adapter_probe(struct btd_adapter *adapter)
        if (!g_dbus_register_interface(dbus_conn, adapter_path,
                                        ADMIN_POLICY_SET_INTERFACE,
                                        admin_policy_adapter_methods, NULL,
-                                       NULL, policy_data, admin_policy_free)) {
+                                       NULL, policy_data, NULL)) {
                btd_error(policy_data->adapter_id,
                        "Admin Policy Set interface init failed on path %s",
                                                                adapter_path);
@@ -506,7 +517,7 @@ static int admin_policy_adapter_probe(struct btd_adapter *adapter)
                                        ADMIN_POLICY_STATUS_INTERFACE,
                                        NULL, NULL,
                                        admin_policy_adapter_properties,
-                                       policy_data, admin_policy_free)) {
+                                       policy_data, NULL)) {
                btd_error(policy_data->adapter_id,
                        "Admin Policy Status interface init failed on path %s",
                                                                adapter_path);
@@ -574,6 +585,19 @@ static void admin_policy_device_removed(struct btd_adapter *adapter,
                unregister_device_data(data, NULL);
 }
 
+static void admin_policy_remove(struct btd_adapter *adapter)
+{
+       DBG("");
+
+       queue_foreach(devices, unregister_device_data, NULL);
+       queue_destroy(devices, g_free);
+
+       if (policy_data) {
+               admin_policy_destroy(policy_data);
+               policy_data = NULL;
+       }
+}
+
 static struct btd_adapter_driver admin_policy_driver = {
        .name   = "admin_policy",
        .probe  = admin_policy_adapter_probe,
@@ -597,11 +621,7 @@ static void admin_exit(void)
        DBG("");
 
        btd_unregister_adapter_driver(&admin_policy_driver);
-       queue_foreach(devices, unregister_device_data, NULL);
-       queue_destroy(devices, g_free);
-
-       if (policy_data)
-               admin_policy_free(policy_data);
+       admin_policy_remove(NULL);
 }
 
 BLUETOOTH_PLUGIN_DEFINE(admin, VERSION,