flimflam: add "psk" security as a way to specify either "wpa" or "rsn"

plugins/newwifi.c

 /*
  *  New WiFi - communicate with wpa_supplicant using the "new D-Bus api"
  *
  *  This file initially created by Google, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
  *  published by the Free Software Foundation.
  *
  *  This program is distributed in the hope that it will be useful,
@@ skipping 792 matching lines @@
 
         if (use_pkcs11) {
                 append_from_network(dict, network, CONNMAN_WIFI_EAP_PIN, "pin");
                 connman_dbus_dict_append_variant(dict, "engine",
                     DBUS_TYPE_INT32, &engine);
                 connman_dbus_dict_append_variant(dict, "engine_id",
                     DBUS_TYPE_STRING, &engine_id);
         }
 }
 
-static int check_wpa(struct connman_network *network)
+static int check_psk(struct connman_network *network)
 {
         const char *passphrase =
             connman_network_get_string(network, "WiFi.Passphrase");
         return (passphrase == NULL || strlen(passphrase) == 0 ? -EINVAL : 0);
 }
 
-static void append_wpa(DBusMessageIter *dict,
-        struct connman_network *network)
+static void append_psk(DBusMessageIter *dict,
+        struct connman_network *network, const char *proto)
 {
         const char *key_mgmt = "WPA-PSK";
         const char *passphrase;
 
         connman_dbus_dict_append_variant(dict, "key_mgmt",
             DBUS_TYPE_STRING, &key_mgmt);
+        connman_dbus_dict_append_variant(dict, "proto",
+            DBUS_TYPE_STRING, &proto);
 
         passphrase = connman_network_get_string(network, "WiFi.Passphrase");
         connman_dbus_dict_append_variant(dict, "psk",
             DBUS_TYPE_STRING, &passphrase);
 }
 
 static int check_wep(struct connman_network *network)
 {
         const char *passphrase =
             connman_network_get_string(network, "WiFi.Passphrase");
@@ skipping 54 matching lines @@
         ssid = connman_network_get_blob(network, "WiFi.SSID", &ssid_len);
         append_byte_array(&dict, "ssid", ssid, ssid_len);
         /* NB: do not set the bssid; this allows wpa_supplicant to roam */
 
         /* must configure background scanning for each netblock */
         append_bgscan(&dict, network);
 
         security = connman_network_get_string(network, "WiFi.Security");
         if (g_ascii_strcasecmp(security, "802_1x") == 0) {
                 append_8021x(&dict, network);
-        } else if (g_ascii_strcasecmp(security, "wpa") == 0 ||
-            g_ascii_strcasecmp(security, "rsn") == 0) {
-                append_wpa(&dict, network);
+        } else if (g_ascii_strcasecmp(security, "psk") == 0) {
+                append_psk(&dict, network, "WPA RSN");
+        } else if (g_ascii_strcasecmp(security, "wpa") == 0) {
+                append_psk(&dict, network, "WPA");
+        } else if (g_ascii_strcasecmp(security, "rsn") == 0) {
+                append_psk(&dict, network, "RSN");
         } else if (g_ascii_strcasecmp(security, "wep") == 0) {
                 append_wep(&dict, network);
         } else {
                 const char *key_mgmt = "NONE";
                 connman_dbus_dict_append_variant(&dict, "key_mgmt",
                     DBUS_TYPE_STRING, &key_mgmt);
         }
 
         dbus_message_iter_close_container(array, &dict);
 }
@@ skipping 427 matching lines @@
 
         free_scan_request(&request);
 
         /* NB: do here, the reply is slow and we want the ui to update asap */
         connman_device_set_scanning_state(task->device, TRUE);
 
         return send_call2(task, message, scan_reply, &task->scan_call,
             __func__, "interface scan");
 }
 
-static struct {
-        char *name;
-        char *value;
-} special_ssid[] = {
-        { "<hidden>", "hidden"  },
-        { "default",  "linksys" },
-        { "wireless"  },
-        { "linksys"   },
-        { "netgear"   },
-        { "dlink"     },
-        { "2wire"     },
-        { "compaq"    },
-        { "tsunami"   },
-        { "comcomcom", "3com"     },
-        { "3Com",      "3com"     },
-        { "Symbol",    "symbol"   },
-        { "Motorola",  "motorola" },
-        { "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 (addr == NULL)
-                return NULL;
-
-        str = g_string_sized_new((ssid_len * 2) + 24);
-        if (str == NULL)
-                return NULL;
-
-        if (ssid == NULL) {
-                g_string_append_printf(str, "hidden_%s", addr);
-                goto done;
-        }
-
-        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, 2*ETH_ALEN, addr);
-                        else
-                                g_string_append_printf(str, "%s_%.*s",
-                                    special_ssid[i].value, 2*ETH_ALEN, 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", 2*ETH_ALEN, addr);
-
-done:
-        g_string_append_printf(str, "_%s_%s", mode, security);
-
-        return g_string_free(str, FALSE);
-}
-
 /*
  * Construct the identifier for a network from the bssid and ssid.
  * We intentionally construct a valid d-bus object path because
  * the constructed string is eventually used this way.
  */
 static void make_objpath(struct supplicant_result *result)
 {
         int i, off;
 
         CONNMAN_ASSERT(2*(ETH_ALEN + result->ssid_len) < sizeof(result->path));
@@ skipping 400 matching lines @@
  * Add/update a BSS entry based on the supplied scan result.
  * We construct a network object (or use an existing one)
  * and record relevant state.
  */
 static struct connman_network *add_bss(struct supplicant_task *task,
         struct supplicant_result *bss)
 {
         struct connman_network *network;
         char *group;
 
-        group = build_group(bss->path, bss->name,
+        group = connman_wifi_build_group(bss->path, bss->name,
             bss->ssid, bss->ssid_len, bss->mode, bss->security);
 
         network = connman_device_get_network(task->device, bss->path);
 
         _DBG_WIFI("%s %s \"%s\" (%s %s%s) signal %d strength %u freq %u",
             network == NULL ? "add" : "update", bss->path, bss->name,
             bss->mode, bss->security, (bss->has_wps == TRUE) ? " WPS" : "",
             bss->signal, bss->strength, bss->frequency);
 
         if (network == NULL) {
@@ skipping 812 matching lines @@
         /*
          * Validate security credentials here; doing it later when
          * constructing netblock contents results in side effects
          * or requires complicated back out of state.
          */
         err = 0;
         if (security == NULL)
                 err = -EINVAL;
         else if (g_ascii_strcasecmp(security, "802_1x") == 0)
                 err = check_8021x(network);
-        else if (g_ascii_strcasecmp(security, "wpa") == 0 ||
+        else if (g_ascii_strcasecmp(security, "psk") == 0 ||
+            g_ascii_strcasecmp(security, "wpa") == 0 ||
             g_ascii_strcasecmp(security, "rsn") == 0)
-                err = check_wpa(network);
+                err = check_psk(network);
         else if (g_ascii_strcasecmp(security, "wep") == 0)
                 err = check_wep(network);
         if (err != 0) {
                 _DBG_WIFI("security failed, network %p security %s err %d",
                     network, security, err);
                 return err;
         }
 
         handle = network_get_handle(task, network, &service_path);
         if (handle != NULL) {
@@ skipping 283 matching lines @@
         dbus_bus_remove_match(connection, bss_rule, NULL);
         dbus_bus_remove_match(connection, interface_rule, NULL);
         dbus_connection_flush(connection);
         dbus_connection_remove_filter(connection, supplicant_filter, NULL);
         dbus_connection_unref(connection);
         connection = NULL;
 }
 
 CONNMAN_PLUGIN_DEFINE(newwifi, "New WiFi interface", VERSION,
     CONNMAN_PLUGIN_PRIORITY_DEFAULT, new_wifi_init, new_wifi_finis)