diff options
| author | taesub kim <taesub.kim@samsung.com> | 2017-02-07 02:24:21 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2017-02-07 02:24:21 -0800 |
| commit | 074b6f009a49abab5e55e3bddd3bd90e59c27bc6 (patch) | |
| tree | 2d8e82ac954ee13f0a817966237184cdae4f0462 /plugins/wifi.c | |
| parent | dab24ad2d7cd118d10099ab0bc6d3c96b14988a5 (diff) | |
| parent | 77076d221356867d576bba8084614f1b15700597 (diff) | |
| download | connman-074b6f009a49abab5e55e3bddd3bd90e59c27bc6.tar.gz connman-074b6f009a49abab5e55e3bddd3bd90e59c27bc6.tar.bz2 connman-074b6f009a49abab5e55e3bddd3bd90e59c27bc6.zip | |
Merge "[connman]: Fixed: ConnMan keep trying connection infintely" into tizen
Diffstat (limited to 'plugins/wifi.c')
| -rwxr-xr-x | plugins/wifi.c | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/plugins/wifi.c b/plugins/wifi.c index c9d8c808..84d07088 100755 --- a/plugins/wifi.c +++ b/plugins/wifi.c @@ -133,6 +133,8 @@ struct wifi_data { struct connman_network *scan_pending_network; bool allow_full_scan; #endif + int disconnect_code; + }; #if defined TIZEN_EXT @@ -2661,6 +2663,25 @@ static void interface_state(GSupplicantInterface *interface) network, wifi)) break; +#if defined TIZEN_EXT + wifi->disconnect_code = g_supplicant_interface_get_disconnect_reason(wifi->interface); + DBG("Disconnect Reason code %d", wifi->disconnect_code); +#endif + /* See table 8-36 Reason codes in IEEE Std 802.11 */ + switch (wifi->disconnect_code) { + case 1: /* Unspecified reason */ + /* Let's assume it's because we got blocked */ + + case 6: /* Class 2 frame received from nonauthenticated STA */ + connman_network_set_error(network, + CONNMAN_NETWORK_ERROR_BLOCKED); + break; + + default: + break; + } + + /* We disable the selected network, if not then * wpa_supplicant will loop retrying */ if (g_supplicant_interface_enable_selected_network(interface, @@ -2669,13 +2690,11 @@ static void interface_state(GSupplicantInterface *interface) #if defined TIZEN_EXT int err; - int reason_code = 0; err = g_supplicant_interface_remove_network(wifi->interface); if (err < 0) DBG("Failed to remove network(%d)", err); - reason_code = g_supplicant_interface_get_disconnect_reason(wifi->interface); /* Some of Wi-Fi networks are not comply Wi-Fi specification. * Retry association until its retry count is expired */ @@ -2685,9 +2704,9 @@ static void interface_state(GSupplicantInterface *interface) break; } - if(reason_code > 0){ - DBG("Set disconnect reason code(%d)", reason_code); - connman_network_set_disconnect_reason(network, reason_code); + if(wifi->disconnect_code > 0){ + DBG("Set disconnect reason code(%d)", wifi->disconnect_code); + connman_network_set_disconnect_reason(network, wifi->disconnect_code); } /* To avoid unnecessary repeated association in wpa_supplicant, |