Don't start DHCP again after handshake

[connman] / plugins / wifi.c

diff --git a/plugins/wifi.c b/plugins/wifi.c
index 4459a27..f70f0b6 100644 (file)
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -36,6 +36,7 @@
 #include <connman/plugin.h>
 #include <connman/driver.h>
 #include <connman/rtnl.h>
+#include <connman/dbus.h>
 #include <connman/log.h>
 
 #include "inet.h"
@@ -140,7 +141,7 @@ static struct connman_element *find_current_element(struct wifi_data *data,
                struct connman_element *element = list->data;
 
                if (connman_element_match_static_property(element,
-                                       "Name", &identifier) == TRUE)
+                                               "Name", &identifier) == TRUE)
                        return element;
        }
 
@@ -156,7 +157,7 @@ static struct connman_element *find_pending_element(struct wifi_data *data,
                struct connman_element *element = list->data;
 
                if (connman_element_match_static_property(element,
-                                       "Name", &identifier) == TRUE)
+                                               "Name", &identifier) == TRUE)
                        return element;
        }
 
@@ -170,11 +171,6 @@ static gboolean inactive_scan(gpointer user_data)
 
        DBG("");
 
-       if (data->cleanup_timer > 0) {
-               g_source_remove(data->cleanup_timer);
-               data->cleanup_timer = 0;
-       }
-
        __supplicant_scan(device);
 
        data->inactive_timer = 0;
@@ -217,6 +213,11 @@ static void state_change(struct connman_element *device,
 
        DBG("state %d", state);
 
+       if (state == STATE_SCANNING)
+               connman_element_set_scanning(device, TRUE);
+       else
+               connman_element_set_scanning(device, FALSE);
+
        if (data == NULL)
                return;
 
@@ -227,7 +228,7 @@ static void state_change(struct connman_element *device,
        if (element == NULL)
                goto reconnect;
 
-       if (state == STATE_COMPLETED) {
+       if (state == STATE_COMPLETED && data->connected == FALSE) {
                struct connman_element *dhcp;
 
                data->connected = TRUE;
@@ -238,7 +239,8 @@ static void state_change(struct connman_element *device,
                dhcp->type = CONNMAN_ELEMENT_TYPE_DHCP;
                dhcp->index = element->index;
 
-               connman_element_register(dhcp, element);
+               if (connman_element_register(dhcp, element) < 0)
+                       connman_element_unref(dhcp);
        } else if (state == STATE_INACTIVE || state == STATE_DISCONNECTED) {
                data->connected = FALSE;
                connman_element_set_enabled(element, FALSE);
@@ -247,7 +249,7 @@ static void state_change(struct connman_element *device,
        }
 
 reconnect:
-       if (state == STATE_INACTIVE || state == STATE_DISCONNECTED) {
+       if (state == STATE_INACTIVE) {
                data->connected = FALSE;
                connect_known_networks(device);
        }
@@ -284,12 +286,14 @@ static void clear_results(struct connman_element *device)
        DBG("pending %d", g_slist_length(data->pending));
        DBG("current %d", g_slist_length(data->current));
 
+       if (data->cleanup_timer > 0) {
+               g_source_remove(data->cleanup_timer);
+               cleanup_pending(data);
+       }
+
        data->pending = data->current;
        data->current = NULL;
 
-       if (data->cleanup_timer > 0)
-               return;
-
        data->cleanup_timer = g_timeout_add_seconds(CLEANUP_TIMEOUT,
                                                        cleanup_pending, data);
 }
@@ -316,14 +320,16 @@ static void scan_result(struct connman_element *device,
        temp = g_strdup(network->identifier);
 
        for (i = 0; i < strlen(temp); i++) {
-               gchar tmp = g_ascii_tolower(temp[i]);
-
-               if (tmp < 'a' || tmp > 'z')
+               char tmp = temp[i];
+               if ((tmp < '0' || tmp > '9') && (tmp < 'A' || tmp > 'Z') &&
+                                               (tmp < 'a' || tmp > 'z'))
                        temp[i] = '_';
        }
 
        element = find_pending_element(data, network->identifier);
        if (element == NULL) {
+               const char *mode;
+
                element = connman_element_create(temp);
 
                element->type = CONNMAN_ELEMENT_TYPE_NETWORK;
@@ -335,6 +341,10 @@ static void scan_result(struct connman_element *device,
                connman_element_add_static_array_property(element, "WiFi.SSID",
                        DBUS_TYPE_BYTE, &network->ssid, network->ssid_len);
 
+               mode = (network->adhoc == TRUE) ? "adhoc" : "managed";
+               connman_element_add_static_property(element, "WiFi.Mode",
+                                               DBUS_TYPE_STRING, &mode);
+
                if (element->wifi.security == NULL) {
                        const char *security;
 
@@ -355,25 +365,31 @@ static void scan_result(struct connman_element *device,
                connman_element_add_static_property(element, "Strength",
                                        DBUS_TYPE_BYTE, &element->strength);
 
-               DBG("%s (%s) strength %d", network->identifier,
+               DBG("%s (%s %s) strength %d", network->identifier, mode,
                                element->wifi.security, element->strength);
 
-               connman_element_register(element, device);
+               if (connman_element_register(element, device) < 0) {
+                       connman_element_unref(element);
+                       goto done;
+               }
        } else {
                data->pending = g_slist_remove(data->pending, element);
 
-               element->strength = network->quality;
+               if (element->strength != network->quality) {
+                       element->strength = network->quality;
 
-               connman_element_set_static_property(element, "Strength",
+                       connman_element_set_static_property(element, "Strength",
                                        DBUS_TYPE_BYTE, &element->strength);
 
-               connman_element_update(element);
+                       connman_element_update(element);
+               }
        }
 
        data->current = g_slist_append(data->current, element);
 
        element->available = TRUE;
 
+done:
        g_free(temp);
 }
 
@@ -445,7 +461,7 @@ static int wifi_disable(struct connman_element *element)
 
        if (data->cleanup_timer > 0) {
                g_source_remove(data->cleanup_timer);
-               data->cleanup_timer = 0;
+               cleanup_pending(data);
        }
 
        if (data->inactive_timer > 0) {
@@ -455,15 +471,6 @@ static int wifi_disable(struct connman_element *element)
 
        __supplicant_disconnect(element);
 
-       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;
 
@@ -546,7 +553,11 @@ static void wifi_newlink(unsigned short type, int index,
        device->name = name;
        device->devname = devname;
 
-       connman_element_register(device, NULL);
+       if (connman_element_register(device, NULL) < 0) {
+               connman_element_unregister(device);
+               return;
+       }
+
        device_list = g_slist_append(device_list, device);
 }
 
@@ -615,7 +626,7 @@ static int wifi_init(void)
 {
        int err;
 
-       connection = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
+       connection = connman_dbus_get_connection();
        if (connection == NULL)
                return -EIO;
 
@@ -637,6 +648,8 @@ static int wifi_init(void)
 
        if (g_dbus_check_service(connection, SUPPLICANT_NAME) == TRUE)
                supplicant_connect(connection, NULL);
+       else
+               __supplicant_activate(connection);
 
        return 0;
 }