Use psk for building hidden WPA SSID group

When building a hidden SSID group for a WPA/WPA2 network, use psk as the
security string. With rsn or wpa strings, 2 services for the same SSID will
show up once the SSID appears in any scan result.

diff --git a/src/service.c b/src/service.c
index e58d15e..e02cb52 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -1902,7 +1902,7 @@ int __connman_service_create_and_connect(DBusMessage *msg)
        struct connman_network *network;
        struct connman_device *device;
        DBusMessageIter iter, array;
-       const char *mode = "managed", *security = "none";
+       const char *mode = "managed", *security = "none", *group_security;
        const char *type = NULL, *ssid = NULL, *passphrase = NULL;
        unsigned int ssid_len = 0;
        const char *ident;
@@ -1973,8 +1973,15 @@ int __connman_service_create_and_connect(DBusMessage *msg)
        if (ident == NULL)
                return -EOPNOTSUPP;
 
+
+       if (!g_strcmp0(security, "wpa") ||
+               !g_strcmp0(security, "rsn"))
+               group_security = "psk";
+       else
+               group_security = security;
+
        group = connman_wifi_build_group_name((unsigned char *) ssid,
-                                               ssid_len, mode, security);
+                                               ssid_len, mode, group_security);
        if (group == NULL)
                return -EINVAL;