Enable joining of IBSS (AdHoc) networks

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 185 matching lines @@
  * Supplicant scan result request parameters.
  */
 struct supplicant_scan_request {
         const char *scan_type;
         GSList *ssids;
 };
 
 #define MAX_SSID_LEN    32              /* 802.11 SSID length (octets) */
 
 /*
+ * Supplicant network modes
+ */
+#define SUPPLICANT_NETWORK_MODE_MANAGED 0
+#define SUPPLICANT_NETWORK_MODE_ADHOC 1
+#define SUPPLICANT_NETWORK_MODE_AP 2
+#define SUPPLICANT_NETWORK_MODE_DEFAULT SUPPLICANT_NETWORK_MODE_MANAGED
+
+/*
  * Per-bss state collected from supplicant scan results.
  */
 struct supplicant_result {
         char path[2*ETH_ALEN+2*MAX_SSID_LEN+1];
         char name[MAX_SSID_LEN+1];
         unsigned char addr[ETH_ALEN];
         unsigned char ssid[MAX_SSID_LEN];
         unsigned int ssid_len;
         gboolean privacy;
         gboolean has_wpa_psk;
@@ skipping 646 matching lines @@
         snprintf(key_name, sizeof(key_name), "wep_key%d", key_index);
 
         key_matter = connman_network_get_blob(network, "WiFi.WEPKey", &key_len);
         CONNMAN_ASSERT(key_matter != NULL);
         append_byte_array(dict, key_name, key_matter, key_len);
 
         connman_dbus_dict_append_variant(dict, "wep_tx_keyidx",
             DBUS_TYPE_UINT32, &key_index);
 }
 
+static void append_mode(DBusMessageIter *dict, struct connman_network *network)
+{
+        dbus_int32_t mode_val = SUPPLICANT_NETWORK_MODE_DEFAULT;
+        const char *mode_str = connman_network_get_string(network, "WiFi.Mode");
+        dbus_int32_t frequency = 0;
+
+        if (g_ascii_strcasecmp(mode_str, "managed") == 0) {
+                mode_val = SUPPLICANT_NETWORK_MODE_MANAGED;
+        } else if (g_ascii_strcasecmp(mode_str, "adhoc") == 0) {
+                mode_val = SUPPLICANT_NETWORK_MODE_ADHOC;
+
+                /*
+                 * NB: wpa_supplicant does not use scan results for
+                 * configuring IBSS so we need to manually select the
+                 * frequency.
+                 */
+                frequency = connman_network_get_uint16(network, "Frequency");
+
+                if (frequency != 0)
+                        connman_dbus_dict_append_variant(dict, "frequency",
+                                                         DBUS_TYPE_INT32,
+                                                         &frequency);
+        } else if (g_ascii_strcasecmp(mode_str, "ap") == 0) {

[Sam Leffler, 2011/03/03 15:51:06]

I prefer "hostap" to "ap" (if you change please also change the #define)

[Paul Stewart, 2011/03/03 21:59:26]

Done.

+                mode_val = SUPPLICANT_NETWORK_MODE_AP;
+        }
+
+        if (mode_val != SUPPLICANT_NETWORK_MODE_DEFAULT)

[Sam Leffler, 2011/03/03 15:51:06]

do you need to avoid sending "mode"? (i.e. just drop the if)

[Paul Stewart, 2011/03/03 21:59:26]

Done.

+                connman_dbus_dict_append_variant(dict, "mode",
+                                                 DBUS_TYPE_INT32, &mode_val);
+}
+
 /*
  * Append properties for the specified network to a dbus message.
  */
 static void append_network_properties(struct supplicant_task *task,
         struct connman_network *network, DBusMessageIter *array)
 {
         DBusMessageIter dict;
         dbus_uint32_t scan_ssid = 1;    /* NB: use directed ProbReq */
         const void *ssid;
         unsigned int ssid_len;
@@ skipping 21 matching lines @@
             g_ascii_strcasecmp(security, "rsn") == 0) {
                 append_wpa(&dict, network);
         } 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);
         }
 
+        append_mode(&dict, network);
+
         dbus_message_iter_close_container(array, &dict);
 }
 
 /*
  * Add a new netblock with properties for the specified network.
  */
 static char *network_add(struct supplicant_task *task,
         struct connman_network *network)
 {
         const char *request = "AddNetwork";
@@ skipping 2043 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)