Fix broken network group name handling

[connman] / plugins / supplicant.c

diff --git a/plugins/supplicant.c b/plugins/supplicant.c
index fc57d35..730fd3d 100644 (file)
--- a/plugins/supplicant.c
+++ b/plugins/supplicant.c
@@ -381,6 +381,8 @@ static void remove_interface_reply(DBusPendingCall *call, void *user_data)
 
        connman_device_unref(task->device);
 
+       inet_ifdown(task->ifindex);
+
        free_task(task);
 
        dbus_message_unref(reply);
@@ -710,7 +712,7 @@ static int set_network(struct supplicant_task *task,
                                        DBUS_TYPE_BYTE, &network, len);
 
        if (g_ascii_strcasecmp(security, "wpa") == 0 ||
-                               g_ascii_strcasecmp(security, "wpa2") == 0) {
+                               g_ascii_strcasecmp(security, "rsn") == 0) {
                const char *key_mgmt = "WPA-PSK";
                connman_dbus_dict_append_variant(&dict, "key_mgmt",
                                                DBUS_TYPE_STRING, &key_mgmt);
@@ -801,22 +803,59 @@ static int initiate_scan(struct supplicant_task *task)
        return 0;
 }
 
-static char *build_group(const unsigned char *ssid, unsigned int ssid_len,
+static struct {
+       char *name;
+       char *value;
+} special_ssid[] = {
+       { "<hidden>", "hidden"  },
+       { "default",  "linksys" },
+       { "wireless"  },
+       { "linksys"   },
+       { "netgear"   },
+       { "dlink"     },
+       { "2wire"     },
+       { "compaq"    },
+       { "tsunami"   },
+       { "comcomcom" },
+       { "Symbol",    "symbol"   },
+       { "Wireless" , "wireless" },
+       { "WLAN",      "wlan"     },
+       { }
+};
+
+static char *build_group(const char *addr, const char *name,
+                       const unsigned char *ssid, unsigned int ssid_len,
                                        const char *mode, const char *security)
 {
        GString *str;
        unsigned int i;
 
-       if (ssid_len < 1)
+       if (addr == NULL)
                return NULL;
 
        str = g_string_sized_new((ssid_len * 2) + 24);
        if (str == NULL)
                return NULL;
 
-       for (i = 0; i < ssid_len; i++)
-               g_string_append_printf(str, "%02x", ssid[i]);
+       for (i = 0; special_ssid[i].name; i++) {
+               if (g_strcmp0(special_ssid[i].name, name) == 0) {
+                       if (special_ssid[i].value == NULL)
+                               g_string_append_printf(str, "%s_%s",
+                                                               name, addr);
+                       else
+                               g_string_append_printf(str, "%s_%s",
+                                               special_ssid[i].value, addr);
+                       goto done;
+               }
+       }
+
+       if (ssid_len > 0 && ssid[0] != '\0') {
+               for (i = 0; i < ssid_len; i++)
+                       g_string_append_printf(str, "%02x", ssid[i]);
+       } else
+               g_string_append_printf(str, "hidden_%s", addr);
 
+done:
        g_string_append_printf(str, "_%s_%s", mode, security);
 
        return g_string_free(str, FALSE);
@@ -854,7 +893,7 @@ static void extract_addr(DBusMessageIter *value,
        if (result->path == NULL)
                return;
 
-       snprintf(result->path, 18, "%02X_%02X_%02X_%02X_%02X_%02X",
+       snprintf(result->path, 18, "%02x%02x%02x%02x%02x%02x",
                                                eth->ether_addr_octet[0],
                                                eth->ether_addr_octet[1],
                                                eth->ether_addr_octet[2],
@@ -876,9 +915,6 @@ static void extract_ssid(DBusMessageIter *value,
        if (ssid_len < 1)
                return;
 
-       if (ssid[0] == '\0')
-               return;
-
        result->ssid = g_try_malloc(ssid_len);
        if (result->ssid == NULL)
                return;
@@ -1043,7 +1079,7 @@ static void properties_reply(DBusPendingCall *call, void *user_data)
        strength = result.quality;
 
        if (result.has_rsn == TRUE)
-               security = "wpa2";
+               security = "rsn";
        else if (result.has_wpa == TRUE)
                security = "wpa";
        else if (result.has_wep == TRUE)
@@ -1053,7 +1089,9 @@ static void properties_reply(DBusPendingCall *call, void *user_data)
 
        mode = (result.adhoc == TRUE) ? "adhoc" : "managed";
 
-       group = build_group(result.ssid, result.ssid_len, mode, security);
+       group = build_group(result.path, result.name,
+                                       result.ssid, result.ssid_len,
+                                                       mode, security);
 
        network = connman_device_get_network(task->device, result.path);
        if (network == NULL) {
@@ -1072,8 +1110,6 @@ static void properties_reply(DBusPendingCall *call, void *user_data)
 
                connman_network_set_string(network, "Address", result.addr);
 
-               connman_network_set_group(network, group);
-
                if (result.name != NULL && result.name[0] != '\0')
                        connman_network_set_string(network, "Name", result.name);
 
@@ -1088,10 +1124,6 @@ static void properties_reply(DBusPendingCall *call, void *user_data)
                }
        }
 
-       connman_network_set_group(network, group);
-
-       g_free(group);
-
        if (result.name != NULL && result.name[0] != '\0')
                connman_network_set_string(network, "Name", result.name);
 
@@ -1109,6 +1141,10 @@ static void properties_reply(DBusPendingCall *call, void *user_data)
 
        connman_network_set_string(network, "WiFi.Security", security);
 
+       connman_network_set_group(network, group);
+
+       g_free(group);
+
 done:
        g_free(result.path);
        g_free(result.addr);
@@ -1341,7 +1377,11 @@ static void state_change(struct supplicant_task *task, DBusMessage *msg)
                connman_network_set_connected(task->network, FALSE);
                connman_device_set_scanning(task->device, FALSE);
                break;
+       case WPA_ASSOCIATING:
+               connman_network_set_associating(task->network, TRUE);
+               break;
        default:
+               connman_network_set_associating(task->network, FALSE);
                break;
        }
 }
@@ -1498,6 +1538,8 @@ int supplicant_connect(struct connman_network *network)
 
        enable_network(task);
 
+       connman_network_set_associating(task->network, TRUE);
+
        return 0;
 }