diff options
author | taesub kim <taesub.kim@samsung.com> | 2016-06-13 21:30:50 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2016-06-13 21:30:50 -0700 |
commit | 6f5ffa18c1f8cf226313d9a8c9accb8781bf4a8c (patch) | |
tree | 3e54e92bcb13aa4d0fcced59c3eaba8b0b330beb /src/network.c | |
parent | f64ceea943f1ff3b9ccc025a1cac7ada2d8daa91 (diff) | |
parent | 0e83b35474b8e01ccbaff484665a6f525ecd67fa (diff) | |
download | connman-6f5ffa18c1f8cf226313d9a8c9accb8781bf4a8c.tar.gz connman-6f5ffa18c1f8cf226313d9a8c9accb8781bf4a8c.tar.bz2 connman-6f5ffa18c1f8cf226313d9a8c9accb8781bf4a8c.zip |
Merge "Add support for WPS2-PSK security type in Security property of service interface" into tizensubmit/tizen/20160614.053635accepted/tizen/wearable/20160614.103626accepted/tizen/tv/20160614.103619accepted/tizen/mobile/20160614.103642accepted/tizen/ivi/20160614.103653accepted/tizen/common/20160614.144019
Diffstat (limited to 'src/network.c')
-rwxr-xr-x | src/network.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/network.c b/src/network.c index 4b2ae113..0d6b442b 100755 --- a/src/network.c +++ b/src/network.c @@ -97,6 +97,7 @@ struct connman_network { unsigned char bssid[WIFI_BSSID_LEN_MAX]; unsigned int maxrate; unsigned int isHS20AP; + bool rsn_selected; #endif } wifi; @@ -1875,6 +1876,14 @@ const char *connman_network_get_enc_mode(struct connman_network *network) return (const char *)network->wifi.encryption_mode; } +int connman_network_set_rsn_selected(struct connman_network *network, + bool rsn_selected) +{ + network->wifi.rsn_selected = rsn_selected; + + return 0; +} + int connman_network_set_proxy(struct connman_network *network, const char *proxies) { @@ -2125,7 +2134,15 @@ const char *connman_network_get_string(struct connman_network *network, else if (g_str_equal(key, "WiFi.Mode")) return network->wifi.mode; else if (g_str_equal(key, "WiFi.Security")) +#if defined TIZEN_EXT + if (network->wifi.rsn_selected != true || + g_str_equal(network->wifi.security, "ieee8021x")) + return network->wifi.security; + else + return "rsn"; +#else return network->wifi.security; +#endif else if (g_str_equal(key, "WiFi.Passphrase")) return network->wifi.passphrase; else if (g_str_equal(key, "WiFi.EAP")) |