Create unique device name and object path

[connman] / plugins / wifi.c

diff --git a/plugins/wifi.c b/plugins/wifi.c
index 494f53b..93312ca 100644 (file)
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -44,6 +44,7 @@
 struct wifi_data {
        GSList *list;
        gchar *identifier;
+       gboolean connected;
 };
 
 static int network_probe(struct connman_element *element)
@@ -60,14 +61,14 @@ static void network_remove(struct connman_element *element)
 
 static int network_enable(struct connman_element *element)
 {
-       char *identifier, *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,
@@ -77,18 +78,26 @@ static int network_enable(struct connman_element *element)
        if (element->parent != NULL) {
                struct wifi_data *data = connman_element_get_data(element->parent);
 
+               if (data->connected == TRUE)
+                       return -EBUSY;
+
                if (data != NULL) {
                        g_free(data->identifier);
-                       data->identifier = g_strdup(identifier);
+                       data->identifier = g_strdup(name);
                }
        }
 
        connman_element_get_value(element,
+                       CONNMAN_PROPERTY_ID_WIFI_SECURITY, &security);
+
+       connman_element_get_value(element,
                        CONNMAN_PROPERTY_ID_WIFI_PASSPHRASE, &passphrase);
 
-       DBG("identifier %s passhprase %s", identifier, passphrase);
+       DBG("name %s security %s passhprase %s",
+                                       name, security, passphrase);
 
-       if (__supplicant_connect(element, ssid, ssid_len, passphrase) < 0)
+       if (__supplicant_connect(element, ssid, ssid_len,
+                                               security, passphrase) < 0)
                connman_error("Failed to initiate connect");
 
        return 0;
@@ -124,7 +133,7 @@ static struct connman_element *find_element(struct wifi_data *data,
                struct connman_element *element = list->data;
 
                if (connman_element_match_static_property(element,
-                                       "WiFi.Name", &identifier) == TRUE)
+                                       "Name", &identifier) == TRUE)
                        return element;
        }
 
@@ -149,13 +158,16 @@ static void state_change(struct connman_element *parent,
        if (state == STATE_COMPLETED) {
                struct connman_element *dhcp;
 
+               data->connected = TRUE;
+
                dhcp = connman_element_create(NULL);
 
                dhcp->type = CONNMAN_ELEMENT_TYPE_DHCP;
                dhcp->index = element->index;
 
                connman_element_register(dhcp, element);
-       }
+       } else if (state == STATE_DISCONNECTED || state == STATE_INACTIVE)
+               data->connected = FALSE;
 }
 
 static void scan_result(struct connman_element *parent,
@@ -180,7 +192,11 @@ static void scan_result(struct connman_element *parent,
        temp = g_strdup(network->identifier);
 
        for (i = 0; i < strlen(temp); i++) {
-               if (temp[i] == ' ' || temp[i] == '.' || temp[i] == '-')
+               if (temp[i] == ' ' || temp[i] == '.')
+                       temp[i] = '_';
+               else if (temp[i] == '-' || temp[i] == '+')
+                       temp[i] = '_';
+               else if (temp[i] == '!' || temp[i] == '?')
                        temp[i] = '_';
                else if (temp[i] == '(' || temp[i] == ')')
                        temp[i] = '_';
@@ -191,7 +207,7 @@ static void scan_result(struct connman_element *parent,
 
        element = find_element(data, network->identifier);
        if (element == NULL) {
-               const char *security;
+               guint8 strength;
 
                element = connman_element_create(temp);
 
@@ -200,27 +216,43 @@ static void scan_result(struct connman_element *parent,
 
                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",
                        DBUS_TYPE_BYTE, &network->ssid, network->ssid_len);
 
-               if (network->has_rsn == TRUE)
-                       security = "wpa2";
-               else if (network->has_wpa == TRUE)
-                       security = "wpa";
-               else if (network->has_wep == TRUE)
-                       security = "wep";
-               else
-                       security = "none";
+               if (element->wifi.security == NULL) {
+                       const char *security;
 
-               connman_element_add_static_property(element, "WiFi.Security",
-                                               DBUS_TYPE_STRING, &security);
+                       if (network->has_rsn == TRUE)
+                               security = "wpa2";
+                       else if (network->has_wpa == TRUE)
+                               security = "wpa";
+                       else if (network->has_wep == TRUE)
+                               security = "wep";
+                       else
+                               security = "none";
+
+                       element->wifi.security = g_strdup(security);
+               }
+
+               strength = network->quality;
+
+               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);
+
+               DBG("%s (%s) strength %d", network->identifier,
+                                       element->wifi.security, strength);
 
                connman_element_register(element, parent);
        }
 
+       element->available = TRUE;
+
        g_free(temp);
 }
 
@@ -239,6 +271,8 @@ static int wifi_probe(struct connman_element *element)
        if (data == NULL)
                return -ENOMEM;
 
+       data->connected = FALSE;
+
        connman_element_set_data(element, data);
 
        return 0;
@@ -322,7 +356,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;
 
@@ -331,10 +365,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);
 
@@ -366,6 +401,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);
@@ -475,5 +511,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)