Use global supplicant filter matching rule

diff --git a/plugins/supplicant.c b/plugins/supplicant.c
index 66cf36f..a51a517 100644 (file)
--- a/plugins/supplicant.c
+++ b/plugins/supplicant.c
@@ -41,6 +41,8 @@
 #define IEEE80211_CAP_IBSS      0x0002
 #define IEEE80211_CAP_PRIVACY   0x0010
 
+static GSList *driver_list = NULL;
+
 struct supplicant_task {
        int ifindex;
        gchar *ifname;
@@ -919,54 +921,6 @@ static DBusHandlerResult supplicant_filter(DBusConnection *conn,
        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
-static int add_filter(struct supplicant_task *task)
-{
-       DBusError error;
-       gchar *filter;
-
-       filter = g_strdup_printf("type=signal,interface=%s.Interface,path=%s",
-                                               SUPPLICANT_INTF, task->path);
-
-       DBG("filter %s", filter);
-
-       dbus_error_init(&error);
-
-       dbus_bus_add_match(connection, filter, &error);
-
-       g_free(filter);
-
-       if (dbus_error_is_set(&error) == TRUE) {
-               connman_error("Can't add match: %s", error.message);
-               dbus_error_free(&error);
-       }
-
-       return 0;
-}
-
-static int remove_filter(struct supplicant_task *task)
-{
-       DBusError error;
-       gchar *filter;
-
-       filter = g_strdup_printf("type=signal,interface=%s.Interface,path=%s",
-                                               SUPPLICANT_INTF, task->path);
-
-       DBG("filter %s", filter);
-
-       dbus_error_init(&error);
-
-       dbus_bus_remove_match(connection, filter, &error);
-
-       g_free(filter);
-
-       if (dbus_error_is_set(&error) == TRUE) {
-               connman_error("Can't add match: %s", error.message);
-               dbus_error_free(&error);
-       }
-
-       return 0;
-}
-
 int __supplicant_start(struct connman_device *device,
                                        struct supplicant_callback *callback)
 {
@@ -1003,8 +957,6 @@ int __supplicant_start(struct connman_device *device,
                }
        }
 
-       add_filter(task);
-
        set_ap_scan(task);
 
        return 0;
@@ -1027,8 +979,6 @@ int __supplicant_stop(struct connman_device *device)
 
        remove_network(task);
 
-       remove_filter(task);
-
        remove_interface(task);
 
        g_free(task->ifname);
@@ -1126,8 +1076,6 @@ static void supplicant_activate(DBusConnection *conn)
        dbus_message_unref(message);
 }
 
-static GSList *driver_list = NULL;
-
 static void supplicant_probe(DBusConnection *conn, void *user_data)
 {
        GSList *list;
@@ -1160,6 +1108,8 @@ static void supplicant_remove(DBusConnection *conn, void *user_data)
        }
 }
 
+static const char *supplicant_rule = "type=signal,"
+                               "interface=" SUPPLICANT_INTF ".Interface";
 static guint watch;
 
 static int supplicant_create(void)
@@ -1179,6 +1129,9 @@ static int supplicant_create(void)
                return -EIO;
        }
 
+       dbus_bus_add_match(connection, supplicant_rule, NULL);
+       dbus_connection_flush(connection);
+
        watch = g_dbus_add_service_watch(connection, SUPPLICANT_NAME,
                        supplicant_probe, supplicant_remove, NULL, NULL);
 
@@ -1195,6 +1148,9 @@ static void supplicant_destroy(void)
        if (watch > 0)
                g_dbus_remove_watch(connection, watch);
 
+       dbus_bus_remove_match(connection, supplicant_rule, NULL);
+       dbus_connection_flush(connection);
+
        dbus_connection_remove_filter(connection, supplicant_filter, NULL);
 
        dbus_connection_unref(connection);

diff --git a/plugins/supplicant.h b/plugins/supplicant.h
index 498f707..691b961 100644 (file)
--- a/plugins/supplicant.h
+++ b/plugins/supplicant.h
@@ -72,7 +72,6 @@ void supplicant_unregister(struct supplicant_driver *driver);
 int __supplicant_start(struct connman_device *device,
                                        struct supplicant_callback *callback);
 int __supplicant_stop(struct connman_device *device);
-
 int __supplicant_scan(struct connman_device *device);
 
 int __supplicant_connect(struct connman_element *element,

diff --git a/plugins/wifi.c b/plugins/wifi.c
index 6459f76..454c6a0 100644 (file)
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -510,7 +510,8 @@ static void wifi_register(void)
 {
        DBG("");
 
-       connman_device_driver_register(&wifi_driver);
+       if (connman_device_driver_register(&wifi_driver) < 0)
+               connman_error("Failed to register WiFi driver");
 }
 
 static void wifi_unregister(void)