gsupplicant: Add network scan ssid setting

diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h
index 0b956d7..dca5c2b 100644 (file)
--- a/gsupplicant/gsupplicant.h
+++ b/gsupplicant/gsupplicant.h
@@ -107,6 +107,7 @@ typedef enum {
 struct _GSupplicantSSID {
        const void *ssid;
        unsigned int ssid_len;
+       unsigned int scan_ssid;
        GSupplicantMode mode;
        GSupplicantSecurity security;
        unsigned int freq;

diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index 52f33af..b3e51cf 100644 (file)
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -2685,14 +2685,14 @@ static void add_network_mode(DBusMessageIter *dict, GSupplicantSSID *ssid)
 static void interface_add_network_params(DBusMessageIter *iter, void *user_data)
 {
        DBusMessageIter dict;
-       dbus_uint32_t scan_ssid = 1;
        struct interface_connect_data *data = user_data;
        GSupplicantSSID *ssid = data->ssid;
 
        supplicant_dbus_dict_open(iter, &dict);
 
-       supplicant_dbus_dict_append_basic(&dict, "scan_ssid",
-                                        DBUS_TYPE_UINT32, &scan_ssid);
+       if (ssid->scan_ssid)
+               supplicant_dbus_dict_append_basic(&dict, "scan_ssid",
+                                        DBUS_TYPE_UINT32, &ssid->scan_ssid);
 
        if (ssid->freq)
                supplicant_dbus_dict_append_basic(&dict, "frequency",

diff --git a/plugins/wifi.c b/plugins/wifi.c
index 6e1e342..78f13fb 100644 (file)
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -353,6 +353,7 @@ static void ssid_init(GSupplicantSSID *ssid, struct connman_network *network)
        ssid->mode = G_SUPPLICANT_MODE_INFRA;
        ssid->ssid = connman_network_get_blob(network, "WiFi.SSID",
                                                &ssid->ssid_len);
+       ssid->scan_ssid = 1;
        security = connman_network_get_string(network, "WiFi.Security");
        ssid->security = network_security(security);
        passphrase = connman_network_get_string(network,