summaryrefslogtreecommitdiff
path: root/gsupplicant
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2011-01-15 01:43:41 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2011-02-02 18:45:36 +0100
commita1f57d60cc477e62f9c9bed39f3b7b6c5b24f123 (patch)
tree1f8b16a8dc99d5c94294751ba985abb2618fd2db /gsupplicant
parent4bbbe466e57df7fce82de4b38b29cd70d2a56ec3 (diff)
downloadconnman-a1f57d60cc477e62f9c9bed39f3b7b6c5b24f123.tar.gz
connman-a1f57d60cc477e62f9c9bed39f3b7b6c5b24f123.tar.bz2
connman-a1f57d60cc477e62f9c9bed39f3b7b6c5b24f123.zip
gsupplicant: Add network scan ssid setting
Diffstat (limited to 'gsupplicant')
-rw-r--r--gsupplicant/gsupplicant.h1
-rw-r--r--gsupplicant/supplicant.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h
index 0b956d7d..dca5c2b1 100644
--- 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 52f33af3..b3e51cfa 100644
--- 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",