Activate wpa_supplicant if needed

[connman] / plugins / wifi.c

diff --git a/plugins/wifi.c b/plugins/wifi.c
index 4459a27..e38f2bb 100644 (file)
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -217,6 +217,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;
 
@@ -238,7 +243,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 +253,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);
        }
@@ -316,9 +322,9 @@ 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] = '_';
        }
 
@@ -358,22 +364,28 @@ static void scan_result(struct connman_element *device,
                DBG("%s (%s) strength %d", network->identifier,
                                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);
 }
 
@@ -546,7 +558,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);
 }
 
@@ -637,6 +653,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;
 }