From: Marcel Holtmann Date: Sun, 17 May 2009 12:27:42 +0000 (-0700) Subject: Use "RSN" instead of "WPA2" for the security details X-Git-Tag: 0.20~131 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e14233adb3e284268565a79d231980e890577015;p=platform%2Fupstream%2Fconnman.git Use "RSN" instead of "WPA2" for the security details --- diff --git a/doc/network-api.txt b/doc/network-api.txt index 3fc3d8d..1bb0f22 100644 --- a/doc/network-api.txt +++ b/doc/network-api.txt @@ -80,7 +80,7 @@ Properties string Address [readonly] case the network was manually created it is also changeable. - Possible values are "none", "wep", "wpa" and "wpa2". + Possible values are "none", "wep", "wpa" and "rsn". string WiFi.Passphrase [readwrite] diff --git a/doc/overview-api.txt b/doc/overview-api.txt index 92aed88..cfc2771 100644 --- a/doc/overview-api.txt +++ b/doc/overview-api.txt @@ -26,11 +26,11 @@ the order of services in this list. +---------------------------------------+ | Guest (strength 90, none) | +---------------------------------------+ - | My WiFi AP (strength 80, wpa2) | + | My WiFi AP (strength 80, rsn) | +---------------------------------------+ | Clear WiMAX (strength 70) | +---------------------------------------+ - | Other AP (strength 70, wpa2) | + | Other AP (strength 70, rsn) | +---------------------------------------+ | Friends AP (strength 70, wep) | +---------------------------------------+ @@ -101,7 +101,7 @@ the favorite setting. It is a manual operation and is equal to users pressing delete/remove button. +---------------------------------------+ - | My WiFi AP (strength 80, wpa2) | order=1 - favorite=yes + | My WiFi AP (strength 80, rsn) | order=1 - favorite=yes +---------------------------------------+ | Ethernet | order=0 +---------------------------------------+ @@ -134,7 +134,7 @@ list. +---------------------------------------+ | Ethernet | order=2 - connected=yes +---------------------------------------+ - | My WiFi AP (strength 80, wpa2) | order=1 - connected=yes + | My WiFi AP (strength 80, rsn) | order=1 - connected=yes +---------------------------------------+ | Guest (strength 90, none) | order=0 +---------------------------------------+ @@ -146,7 +146,7 @@ Manager will not take down default routes if there is no reason to do so. A working connection is considered top priority. +---------------------------------------+ - | My WiFi AP (strength 80, wpa2) | order=2 - connected=yes + | My WiFi AP (strength 80, rsn) | order=2 - connected=yes +---------------------------------------+ | Ethernet | order=1 - connected=yes +---------------------------------------+ @@ -159,7 +159,7 @@ in this case the favorite setting will be removed and the service falls back down in the list. +---------------------------------------+ - | My WiFi AP (strength 80, wpa2) | order=1 - connected=yes + | My WiFi AP (strength 80, rsn) | order=1 - connected=yes +---------------------------------------+ | Ethernet | order=0 +---------------------------------------+ @@ -179,7 +179,7 @@ and are sorted above all others. +---------------------------------------+ | Ethernet | order=2 - connected=yes +---------------------------------------+ - | My WiFi AP (strength 80, wpa2) | order=1 - connected=no + | My WiFi AP (strength 80, rsn) | order=1 - connected=no +---------------------------------------+ | Guest (strength 90, none) | order=0 +---------------------------------------+ @@ -190,7 +190,7 @@ the basic ordering of services it will be at the top of the services with an order number of 0 (directly after all favorite services). +---------------------------------------+ - | My WiFi AP (strength 80, wpa2) | order=1 - connected=no + | My WiFi AP (strength 80, rsn) | order=1 - connected=no +---------------------------------------+ | Ethernet | order=0 - connected=no +---------------------------------------+ diff --git a/doc/service-api.txt b/doc/service-api.txt index 4864951..556a7ad 100644 --- a/doc/service-api.txt +++ b/doc/service-api.txt @@ -117,7 +117,7 @@ Properties string State [readonly] present and contains the security method or key management setting. - Possible values are "none", "wep", "wpa" and "wpa2". + Possible values are "none", "wep", "wpa" and "rsn". This property might be only present for WiFi services. diff --git a/include/service.h b/include/service.h index 652add2..eddd546 100644 --- a/include/service.h +++ b/include/service.h @@ -50,7 +50,7 @@ enum connman_service_security { CONNMAN_SERVICE_SECURITY_NONE = 1, CONNMAN_SERVICE_SECURITY_WEP = 2, CONNMAN_SERVICE_SECURITY_WPA = 3, - CONNMAN_SERVICE_SECURITY_WPA2 = 4, + CONNMAN_SERVICE_SECURITY_RSN = 4, }; enum connman_service_state { diff --git a/plugins/supplicant.c b/plugins/supplicant.c index a7cf3ff..a7724d0 100644 --- a/plugins/supplicant.c +++ b/plugins/supplicant.c @@ -712,7 +712,7 @@ static int set_network(struct supplicant_task *task, DBUS_TYPE_BYTE, &network, len); if (g_ascii_strcasecmp(security, "wpa") == 0 || - g_ascii_strcasecmp(security, "wpa2") == 0) { + g_ascii_strcasecmp(security, "rsn") == 0) { const char *key_mgmt = "WPA-PSK"; connman_dbus_dict_append_variant(&dict, "key_mgmt", DBUS_TYPE_STRING, &key_mgmt); @@ -1062,7 +1062,7 @@ static void properties_reply(DBusPendingCall *call, void *user_data) strength = result.quality; if (result.has_rsn == TRUE) - security = "wpa2"; + security = "rsn"; else if (result.has_wpa == TRUE) security = "wpa"; else if (result.has_wep == TRUE) diff --git a/src/service.c b/src/service.c index 4d8c0d6..48f035b 100644 --- a/src/service.c +++ b/src/service.c @@ -141,8 +141,8 @@ static const char *security2string(enum connman_service_security security) return "wep"; case CONNMAN_SERVICE_SECURITY_WPA: return "wpa"; - case CONNMAN_SERVICE_SECURITY_WPA2: - return "wpa2"; + case CONNMAN_SERVICE_SECURITY_RSN: + return "rsn"; } return NULL; @@ -1075,8 +1075,8 @@ static enum connman_service_mode convert_wifi_security(const char *security) return CONNMAN_SERVICE_SECURITY_WEP; else if (g_str_equal(security, "wpa") == TRUE) return CONNMAN_SERVICE_SECURITY_WPA; - else if (g_str_equal(security, "wpa2") == TRUE) - return CONNMAN_SERVICE_SECURITY_WPA2; + else if (g_str_equal(security, "rsn") == TRUE) + return CONNMAN_SERVICE_SECURITY_RSN; else return CONNMAN_SERVICE_SECURITY_UNKNOWN; } diff --git a/test/join-network b/test/join-network index 41cb492..b5f63c9 100755 --- a/test/join-network +++ b/test/join-network @@ -30,7 +30,7 @@ for path in properties["Devices"]: if len(sys.argv) > 3: security = sys.argv[3] else: - security = "wpa2" + security = "rsn" passphrase = sys.argv[2] else: security = "none"