Remove unused variable

[connman] / plugins / wifi.c

diff --git a/plugins/wifi.c b/plugins/wifi.c
index 0ae20f5..e463589 100644 (file)
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -41,8 +41,12 @@
 #include "inet.h"
 #include "supplicant.h"
 
+#define CLEANUP_PENDING_TIMEOUT  8     /* in seconds */
+
 struct wifi_data {
-       GSList *list;
+       GSList *current;
+       GSList *pending;
+       guint timer;
        gchar *identifier;
        gboolean connected;
 };
@@ -61,14 +65,14 @@ static void network_remove(struct connman_element *element)
 
 static int network_enable(struct connman_element *element)
 {
-       char *identifier, *security = NULL, *passphrase = NULL;
+       char *name, *security = NULL, *passphrase = NULL;
        unsigned char *ssid;
        int ssid_len;
 
        DBG("element %p name %s", element, element->name);
 
        if (connman_element_get_static_property(element,
-                                       "WiFi.Name", &identifier) == FALSE)
+                                               "Name", &name) == FALSE)
                return -EIO;
 
        if (connman_element_get_static_array_property(element,
@@ -83,7 +87,7 @@ static int network_enable(struct connman_element *element)
 
                if (data != NULL) {
                        g_free(data->identifier);
-                       data->identifier = g_strdup(identifier);
+                       data->identifier = g_strdup(name);
                }
        }
 
@@ -93,8 +97,8 @@ static int network_enable(struct connman_element *element)
        connman_element_get_value(element,
                        CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE, &passphrase);
 
-       DBG("identifier %s security %s passhprase %s",
-                                       identifier, security, passphrase);
+       DBG("name %s security %s passhprase %s",
+                                       name, security, passphrase);
 
        if (__supplicant_connect(element, ssid, ssid_len,
                                                security, passphrase) < 0)
@@ -124,16 +128,32 @@ static struct connman_driver network_driver = {
        .disable        = network_disable,
 };
 
-static struct connman_element *find_element(struct wifi_data *data,
-                                               const char *identifier)
+static struct connman_element *find_current_element(struct wifi_data *data,
+                                                       const char *identifier)
 {
        GSList *list;
 
-       for (list = data->list; list; list = list->next) {
+       for (list = data->current; list; list = list->next) {
                struct connman_element *element = list->data;
 
                if (connman_element_match_static_property(element,
-                                       "WiFi.Name", &identifier) == TRUE)
+                                       "Name", &identifier) == TRUE)
+                       return element;
+       }
+
+       return NULL;
+}
+
+static struct connman_element *find_pending_element(struct wifi_data *data,
+                                                       const char *identifier)
+{
+       GSList *list;
+
+       for (list = data->pending; list; list = list->next) {
+               struct connman_element *element = list->data;
+
+               if (connman_element_match_static_property(element,
+                                       "Name", &identifier) == TRUE)
                        return element;
        }
 
@@ -148,10 +168,13 @@ static void state_change(struct connman_element *parent,
 
        DBG("state %d", state);
 
+       if (data == NULL)
+               return;
+
        if (data->identifier == NULL)
                return;
 
-       element = find_element(data, data->identifier);
+       element = find_current_element(data, data->identifier);
        if (element == NULL)
                return;
 
@@ -170,6 +193,45 @@ static void state_change(struct connman_element *parent,
                data->connected = FALSE;
 }
 
+static gboolean cleanup_pending(gpointer user_data)
+{
+       struct wifi_data *data = user_data;
+       GSList *list;
+
+       DBG("");
+
+       for (list = data->pending; list; list = list->next) {
+               struct connman_element *element = list->data;
+
+               DBG("element %p name %s", element, element->name);
+
+               connman_element_unregister(element);
+               connman_element_unref(element);
+       }
+
+       g_slist_free(data->pending);
+       data->pending = NULL;
+
+       data->timer = 0;
+
+       return FALSE;
+}
+
+static void clear_results(struct connman_element *parent)
+{
+       struct wifi_data *data = connman_element_get_data(parent);
+
+       DBG("pending %d", g_slist_length(data->pending));
+       DBG("current %d", g_slist_length(data->current));
+
+       data->pending = data->current;
+       data->current = NULL;
+
+       if (data->timer == 0)
+               data->timer = g_timeout_add_seconds(CLEANUP_PENDING_TIMEOUT,
+                                                       cleanup_pending, data);
+}
+
 static void scan_result(struct connman_element *parent,
                                        struct supplicant_network *network)
 {
@@ -205,7 +267,7 @@ static void scan_result(struct connman_element *parent,
                temp[i] = g_ascii_tolower(temp[i]);
        }
 
-       element = find_element(data, network->identifier);
+       element = find_pending_element(data, network->identifier);
        if (element == NULL) {
                guint8 strength;
 
@@ -214,9 +276,7 @@ static void scan_result(struct connman_element *parent,
                element->type = CONNMAN_ELEMENT_TYPE_NETWORK;
                element->index = parent->index;
 
-               data->list = g_slist_append(data->list, element);
-
-               connman_element_add_static_property(element, "WiFi.Name",
+               connman_element_add_static_property(element, "Name",
                                DBUS_TYPE_STRING, &network->identifier);
 
                connman_element_add_static_array_property(element, "WiFi.SSID",
@@ -239,8 +299,8 @@ static void scan_result(struct connman_element *parent,
 
                strength = network->quality;
 
-               //connman_element_add_static_property(element, "WiFi.Strength",
-               //                              DBUS_TYPE_BYTE, &strength);
+               connman_element_add_static_property(element, "WiFi.Strength",
+                                               DBUS_TYPE_BYTE, &strength);
 
                //connman_element_add_static_property(element, "WiFi.Noise",
                //                      DBUS_TYPE_INT32, &network->noise);
@@ -249,13 +309,19 @@ static void scan_result(struct connman_element *parent,
                                        element->wifi.security, strength);
 
                connman_element_register(element, parent);
-       }
+       } else
+               data->pending = g_slist_remove(data->pending, element);
+
+       data->current = g_slist_append(data->current, element);
+
+       element->available = TRUE;
 
        g_free(temp);
 }
 
 static struct supplicant_callback wifi_callback = {
        .state_change   = state_change,
+       .clear_results  = clear_results,
        .scan_result    = scan_result,
 };
 
@@ -319,19 +385,35 @@ static int wifi_disable(struct connman_element *element)
 
        DBG("element %p name %s", element, element->name);
 
+       if (data->timer > 0) {
+               g_source_remove(data->timer);
+               data->timer = 0;
+       }
+
        __supplicant_disconnect(element);
 
-       for (list = data->list; list; list = list->next) {
+       for (list = data->pending; list; list = list->next) {
+               struct connman_element *network = list->data;
+
+               connman_element_unref(network);
+       }
+
+       g_slist_free(data->pending);
+       data->pending = NULL;
+
+       for (list = data->current; list; list = list->next) {
                struct connman_element *network = list->data;
 
                connman_element_unref(network);
        }
 
-       g_slist_free(data->list);
-       data->list = NULL;
+       g_slist_free(data->current);
+       data->current = NULL;
 
        connman_element_unregister_children(element);
 
+       __supplicant_stop(element);
+
        return 0;
 }
 
@@ -354,7 +436,7 @@ static void wifi_newlink(unsigned short type, int index,
        struct connman_element *device;
        GSList *list;
        gboolean exists = FALSE;
-       gchar *name;
+       gchar *name, *devname;
        struct iwreq iwr;
        int sk;
 
@@ -363,10 +445,11 @@ static void wifi_newlink(unsigned short type, int index,
        if (type != ARPHRD_ETHER)
                return;
 
-       name = inet_index2name(index);
+       name = inet_index2ident(index, "dev_");
+       devname = inet_index2name(index);
 
        memset(&iwr, 0, sizeof(iwr));
-       strncpy(iwr.ifr_ifrn.ifrn_name, name, IFNAMSIZ);
+       strncpy(iwr.ifr_ifrn.ifrn_name, devname, IFNAMSIZ);
 
        sk = socket(PF_INET, SOCK_DGRAM, 0);
 
@@ -398,6 +481,7 @@ static void wifi_newlink(unsigned short type, int index,
 
        device->index = index;
        device->name = name;
+       device->devname = devname;
 
        connman_element_register(device, NULL);
        device_list = g_slist_append(device_list, device);
@@ -507,5 +591,5 @@ static void wifi_exit(void)
        dbus_connection_unref(connection);
 }
 
-CONNMAN_PLUGIN_DEFINE("wifi", "WiFi interface plugin", VERSION,
+CONNMAN_PLUGIN_DEFINE(wifi, "WiFi interface plugin", VERSION,
                                                        wifi_init, wifi_exit)