diff options
| author | Saurav Babu <saurav.babu@samsung.com> | 2017-12-27 16:13:05 +0530 |
|---|---|---|
| committer | Saurav Babu <saurav.babu@samsung.com> | 2017-12-27 12:41:28 +0000 |
| commit | 9458c40dfd9b99b9da24e3cdb249dbc116e8750c (patch) | |
| tree | 4e89981bf4b6f446183c990e52d2a842fe170b53 /gsupplicant | |
| parent | f911da60ac8a5058b8182c30f765e12d7bdaf943 (diff) | |
| download | connman-9458c40dfd9b99b9da24e3cdb249dbc116e8750c.tar.gz connman-9458c40dfd9b99b9da24e3cdb249dbc116e8750c.tar.bz2 connman-9458c40dfd9b99b9da24e3cdb249dbc116e8750c.zip | |
connman: Get HS20 property of service correctlysubmit/tizen/20171228.074717submit/tizen/20171228.053515accepted/tizen/unified/20171229.070200
Change-Id: I21d3a4ba5632d5a00a3254137b12dfdbd1dbe3dc
Signed-off-by: Saurav Babu <saurav.babu@samsung.com>
Diffstat (limited to 'gsupplicant')
| -rwxr-xr-x | gsupplicant/gsupplicant.h | 2 | ||||
| -rwxr-xr-x | gsupplicant/supplicant.c | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h index a33dab0f..9177275e 100755 --- a/gsupplicant/gsupplicant.h +++ b/gsupplicant/gsupplicant.h @@ -372,7 +372,7 @@ const unsigned char *g_supplicant_network_get_bssid( unsigned int g_supplicant_network_get_maxrate(GSupplicantNetwork *network); const char *g_supplicant_network_get_enc_mode(GSupplicantNetwork *network); bool g_supplicant_network_get_rsn_mode(GSupplicantNetwork *network); -unsigned int g_supplicant_network_is_hs20AP(GSupplicantNetwork *network); +bool g_supplicant_network_is_hs20AP(GSupplicantNetwork *network); const char *g_supplicant_network_get_eap(GSupplicantNetwork *network); const char *g_supplicant_network_get_identity(GSupplicantNetwork *network); const char *g_supplicant_network_get_phase2(GSupplicantNetwork *network); diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c index b1232a5d..d84c8930 100755 --- a/gsupplicant/supplicant.c +++ b/gsupplicant/supplicant.c @@ -213,6 +213,7 @@ struct g_supplicant_bss { dbus_bool_t ft_ieee8021x; char *wifi_vsie; unsigned int wifi_vsie_len; + dbus_bool_t hs20; #endif unsigned int wps_capabilities; }; @@ -234,7 +235,7 @@ struct _GSupplicantNetwork { GHashTable *bss_table; GHashTable *config_table; #if defined TIZEN_EXT - unsigned int isHS20AP; + bool isHS20AP; char *eap; char *identity; char *phase2; @@ -1182,7 +1183,7 @@ const char *g_supplicant_peer_get_name(GSupplicantPeer *peer) } #if defined TIZEN_EXT -unsigned int g_supplicant_network_is_hs20AP(GSupplicantNetwork *network) +bool g_supplicant_network_is_hs20AP(GSupplicantNetwork *network) { if (!network) return 0; @@ -1685,6 +1686,8 @@ static void add_or_replace_bss_to_network(struct g_supplicant_bss *bss) SUPPLICANT_DBG("Failed to allocate memory for wifi_vsie"); } } + + network->isHS20AP = bss->hs20; #endif SUPPLICANT_DBG("New network %s created", network->name); @@ -2101,6 +2104,12 @@ static void bss_property(const char *key, DBusMessageIter *iter, bss->rsn_selected = FALSE; supplicant_dbus_property_foreach(iter, bss_wpa, bss); +#if defined TIZEN_EXT + } else if (g_strcmp0(key, "HS20") == 0) { + dbus_bool_t hs20 = FALSE; + dbus_message_iter_get_basic(iter, &hs20); + bss->hs20 = hs20; +#endif } else if (g_strcmp0(key, "IEs") == 0) bss_process_ies(iter, bss); else |