device: Combine two if statements with identical outcome

[framework/connectivity/connman.git] / plugins / bluetooth.c

diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c
index 65a9d5d..9e1aaa2 100644 (file)
--- a/plugins/bluetooth.c
+++ b/plugins/bluetooth.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -446,7 +446,7 @@ static void network_properties_reply(DBusPendingCall *call, void *user_data)
 
        connman_network_set_group(network, ident);
 
-       g_hash_table_insert(bluetooth_networks, g_strdup(path), network);
+       g_hash_table_replace(bluetooth_networks, g_strdup(path), network);
 
 done:
        dbus_message_unref(reply);
@@ -571,8 +571,6 @@ static gboolean device_removed(DBusConnection *connection,
 
        g_hash_table_remove(bluetooth_networks, network_path);
 
-       connman_device_remove_network(device, network);
-
        return TRUE;
 }
 
@@ -601,6 +599,36 @@ static gboolean device_changed(DBusConnection *connection,
        return TRUE;
 }
 
+static void remove_device_networks(struct connman_device *device)
+{
+       GHashTableIter iter;
+       gpointer key, value;
+       GSList *key_list = NULL;
+       GSList *list;
+
+       if (bluetooth_networks == NULL)
+               return;
+
+       g_hash_table_iter_init(&iter, bluetooth_networks);
+
+       while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
+               struct connman_network *network = value;
+
+               if (connman_network_get_device(network) != device)
+                       continue;
+
+               key_list = g_slist_append(key_list, key);
+       }
+
+       for (list = key_list; list != NULL; list = list->next) {
+               const char *network_path = list->data;
+
+               g_hash_table_remove(bluetooth_networks, network_path);
+       }
+
+       g_slist_free(key_list);
+}
+
 static void adapter_properties_reply(DBusPendingCall *call, void *user_data)
 {
        char *path = user_data;
@@ -667,6 +695,8 @@ update:
 
        if (powered == TRUE)
                check_networks(device, &networks);
+       else
+               remove_device_networks(device);
 
 done:
        dbus_message_unref(reply);
@@ -783,10 +813,26 @@ static void unregister_device(gpointer data)
 
        DBG("");
 
+       remove_device_networks(device);
+
        connman_device_unregister(device);
        connman_device_unref(device);
 }
 
+static void remove_network(gpointer data)
+{
+       struct connman_network *network = data;
+       struct connman_device *device;
+
+       DBG("network %p", network);
+
+       device = connman_network_get_device(network);
+       if (device != NULL)
+               connman_device_remove_network(device, network);
+
+       connman_network_unref(network);
+}
+
 static void bluetooth_connect(DBusConnection *connection, void *user_data)
 {
        DBusMessage *message;
@@ -798,7 +844,7 @@ static void bluetooth_connect(DBusConnection *connection, void *user_data)
                                                g_free, unregister_device);
 
        bluetooth_networks = g_hash_table_new_full(g_str_hash, g_str_equal,
-                                               g_free, NULL);
+                                               g_free, remove_network);
 
        message = dbus_message_new_method_call(BLUEZ_SERVICE, "/",
                                BLUEZ_MANAGER_INTERFACE, LIST_ADAPTERS);
@@ -832,15 +878,31 @@ static void bluetooth_disconnect(DBusConnection *connection, void *user_data)
                return;
 
        g_hash_table_destroy(bluetooth_networks);
+       bluetooth_networks = NULL;
        g_hash_table_destroy(bluetooth_devices);
        bluetooth_devices = NULL;
 }
 
 static int bluetooth_probe(struct connman_device *device)
 {
+       GHashTableIter iter;
+       gpointer key, value;
+
        DBG("device %p", device);
 
-       return 0;
+       if (bluetooth_devices == NULL)
+               return -ENOTSUP;
+
+       g_hash_table_iter_init(&iter, bluetooth_devices);
+
+       while (g_hash_table_iter_next(&iter, &key, &value) == TRUE) {
+               struct connman_device *device_pan = value;
+
+               if (device == device_pan)
+                       return 0;
+       }
+
+       return -ENOTSUP;
 }
 
 static void bluetooth_remove(struct connman_device *device)
@@ -1184,7 +1246,7 @@ static int bluetooth_init(void)
        if (err < 0) {
                connman_device_driver_unregister(&bluetooth_driver);
                connman_network_driver_unregister(&pan_driver);
-               return err;
+               goto remove;
        }
 
        return 0;