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 | |
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')
-rwxr-xr-x | src/agent-connman.c | 6 | ||||
-rwxr-xr-x | src/config.c | 3 | ||||
-rwxr-xr-x | src/network.c | 17 | ||||
-rwxr-xr-x | src/service.c | 15 |
4 files changed, 41 insertions, 0 deletions
diff --git a/src/agent-connman.c b/src/agent-connman.c index d9502a7a..177cbe0a 100755 --- a/src/agent-connman.c +++ b/src/agent-connman.c @@ -225,6 +225,9 @@ static void request_input_append_passphrase(DBusMessageIter *iter, value = "wep"; break; case CONNMAN_SERVICE_SECURITY_PSK: +#if defined TIZEN_EXT + case CONNMAN_SERVICE_SECURITY_RSN: +#endif value = "psk"; break; case CONNMAN_SERVICE_SECURITY_8021X: @@ -358,6 +361,9 @@ static void previous_passphrase_handler(DBusMessageIter *iter, data.type = "wep"; break; case CONNMAN_SERVICE_SECURITY_PSK: +#if defined TIZEN_EXT + case CONNMAN_SERVICE_SECURITY_RSN: +#endif data.type = "psk"; break; /* diff --git a/src/config.c b/src/config.c index 8ae1764d..778e57cf 100755 --- a/src/config.c +++ b/src/config.c @@ -685,6 +685,9 @@ static bool load_service(GKeyFile *keyfile, const char *group, if (str) { if (security == CONNMAN_SERVICE_SECURITY_PSK || +#if defined TIZEN_EXT + security == CONNMAN_SERVICE_SECURITY_RSN || +#endif security == CONNMAN_SERVICE_SECURITY_WEP) { service->security = security; } else { 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")) diff --git a/src/service.c b/src/service.c index ca291199..b424bd5c 100755 --- a/src/service.c +++ b/src/service.c @@ -327,6 +327,10 @@ enum connman_service_security __connman_service_string2security(const char *str) return CONNMAN_SERVICE_SECURITY_NONE; if (!strcmp(str, "wep")) return CONNMAN_SERVICE_SECURITY_WEP; +#if defined TIZEN_EXT + if (!strcmp(str, "rsn")) + return CONNMAN_SERVICE_SECURITY_RSN; +#endif return CONNMAN_SERVICE_SECURITY_UNKNOWN; } @@ -342,8 +346,14 @@ static const char *security2string(enum connman_service_security security) return "wep"; case CONNMAN_SERVICE_SECURITY_PSK: case CONNMAN_SERVICE_SECURITY_WPA: +#if defined TIZEN_EXT + return "psk"; + case CONNMAN_SERVICE_SECURITY_RSN: + return "rsn"; +#else case CONNMAN_SERVICE_SECURITY_RSN: return "psk"; +#endif case CONNMAN_SERVICE_SECURITY_8021X: return "ieee8021x"; } @@ -3377,7 +3387,9 @@ static int check_passphrase(enum connman_service_security security, case CONNMAN_SERVICE_SECURITY_UNKNOWN: case CONNMAN_SERVICE_SECURITY_NONE: case CONNMAN_SERVICE_SECURITY_WPA: +#if !defined TIZEN_EXT case CONNMAN_SERVICE_SECURITY_RSN: +#endif DBG("service security '%s' (%d) not handled", security2string(security), security); @@ -3385,6 +3397,9 @@ static int check_passphrase(enum connman_service_security security, return -EOPNOTSUPP; case CONNMAN_SERVICE_SECURITY_PSK: +#if defined TIZEN_EXT + case CONNMAN_SERVICE_SECURITY_RSN: +#endif /* A raw key is always 64 bytes length, * its content is in hex representation. * A PSK key must be between [8..63]. |