Fix broken network group name handling

[connman] / plugins / supplicant.c

diff --git a/plugins/supplicant.c b/plugins/supplicant.c
index 164a55c..730fd3d 100644 (file)
--- a/plugins/supplicant.c
+++ b/plugins/supplicant.c
@@ -807,8 +807,19 @@ static struct {
        char *name;
        char *value;
 } special_ssid[] = {
-       { "linksys" },
-       { "dlink"   },
+       { "<hidden>", "hidden"  },
+       { "default",  "linksys" },
+       { "wireless"  },
+       { "linksys"   },
+       { "netgear"   },
+       { "dlink"     },
+       { "2wire"     },
+       { "compaq"    },
+       { "tsunami"   },
+       { "comcomcom" },
+       { "Symbol",    "symbol"   },
+       { "Wireless" , "wireless" },
+       { "WLAN",      "wlan"     },
        { }
 };
 
@@ -828,7 +839,12 @@ static char *build_group(const char *addr, const char *name,
 
        for (i = 0; special_ssid[i].name; i++) {
                if (g_strcmp0(special_ssid[i].name, name) == 0) {
-                       g_string_append_printf(str, "%s_%s", name, addr);
+                       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;
                }
        }
@@ -1094,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);
 
@@ -1110,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);
 
@@ -1131,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);