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 /src | |
| 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 'src')
| -rwxr-xr-x | src/network.c | 25 | ||||
| -rwxr-xr-x | src/service.c | 2 |
2 files changed, 6 insertions, 21 deletions
diff --git a/src/network.c b/src/network.c index 64c26cca..5aac8d6a 100755 --- a/src/network.c +++ b/src/network.c @@ -103,7 +103,7 @@ struct connman_network { char encryption_mode[WIFI_ENCYPTION_MODE_LEN_MAX]; unsigned char bssid[WIFI_BSSID_LEN_MAX]; unsigned int maxrate; - unsigned int isHS20AP; + bool isHS20AP; unsigned int keymgmt; char *keymgmt_type; bool rsn_mode; @@ -2022,25 +2022,6 @@ int connman_network_set_proxy(struct connman_network *network, return 0; } -int connman_network_set_is_hs20AP(struct connman_network *network, - unsigned int isHS20AP) -{ - if (!network) - return 0; - - network->wifi.isHS20AP = isHS20AP; - - return 0; -} - -unsigned int connman_network_get_is_hs20AP(struct connman_network *network) -{ - if (!network) - return 0; - - return network->wifi.isHS20AP; -} - int connman_network_set_keymgmt(struct connman_network *network, unsigned int keymgmt) { @@ -2377,6 +2358,8 @@ int connman_network_set_bool(struct connman_network *network, #if defined TIZEN_EXT else if (g_strcmp0(key, "DefaultInternet") == 0) network->default_internet = value; + else if (g_strcmp0(key, "WiFi.HS20AP") == 0) + network->wifi.isHS20AP = value; #endif return -EINVAL; @@ -2405,6 +2388,8 @@ bool connman_network_get_bool(struct connman_network *network, #if defined TIZEN_EXT else if (g_str_equal(key, "DefaultInternet")) return network->default_internet; + else if (g_str_equal(key, "WiFi.HS20AP")) + return network->wifi.isHS20AP; #endif return false; diff --git a/src/service.c b/src/service.c index 3d491a8c..129b4105 100755 --- a/src/service.c +++ b/src/service.c @@ -3175,7 +3175,7 @@ static void append_wifi_ext_info(DBusMessageIter *dict, maxrate = connman_network_get_maxrate(network); frequency = connman_network_get_frequency(network); enc_mode = connman_network_get_enc_mode(network); - passpoint = connman_network_get_is_hs20AP(network); + passpoint = connman_network_get_bool(network, "WiFi.HS20AP"); keymgmt = connman_network_get_keymgmt(network); snprintf(bssid_str, WIFI_BSSID_STR_LEN, "%02x:%02x:%02x:%02x:%02x:%02x", |