SME: Fix re-try after auth/assoc timeout/failure

[thirdparty/hostap.git] / wpa_supplicant / sme.c

diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c
index 985c9001ccc5154a8fac3645a9abe7dad137c700..55788de010ce36db510f96f0bc3cf65c104b6c81 100644 (file)
--- a/wpa_supplicant/sme.c
+++ b/wpa_supplicant/sme.c
@@ -33,6 +33,77 @@
 #include "scan.h"
 #include "sme.h"
 
+static int sme_another_bss_in_ess(struct wpa_supplicant *wpa_s)
+{
+       struct wpa_bss *bss, *cbss;
+
+       cbss = wpa_s->current_bss;
+
+       dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list) {
+               if (bss == cbss)
+                       continue;
+               if (bss->ssid_len == cbss->ssid_len &&
+                   os_memcmp(bss->ssid, cbss->ssid, bss->ssid_len) == 0 &&
+                   wpa_blacklist_get(wpa_s, bss->bssid) == NULL)
+                       return 1;
+       }
+
+       return 0;
+}
+
+
+static void sme_connection_failed(struct wpa_supplicant *wpa_s,
+                                 const u8 *bssid)
+{
+       int timeout;
+       int count;
+
+       /*
+        * Add the failed BSSID into the blacklist and speed up next scan
+        * attempt if there could be other APs that could accept association.
+        * The current blacklist count indicates how many times we have tried
+        * connecting to this AP and multiple attempts mean that other APs are
+        * either not available or has already been tried, so that we can start
+        * increasing the delay here to avoid constant scanning.
+        */
+       count = wpa_blacklist_add(wpa_s, bssid);
+       if (count == 1 && wpa_s->current_bss) {
+               /*
+                * This BSS was not in the blacklist before. If there is
+                * another BSS available for the same ESS, we should try that
+                * next. Otherwise, we may as well try this one once more
+                * before allowing other, likely worse, ESSes to be considered.
+                */
+               if (sme_another_bss_in_ess(wpa_s)) {
+                       wpa_printf(MSG_DEBUG, "SME: Another BSS in this ESS "
+                                  "has been seen; try it next");
+                       wpa_blacklist_add(wpa_s, bssid);
+               }
+       }
+
+       switch (count) {
+       case 1:
+               timeout = 100;
+               break;
+       case 2:
+               timeout = 500;
+               break;
+       case 3:
+               timeout = 1000;
+               break;
+       default:
+               timeout = 5000;
+       }
+
+       /*
+        * TODO: if more than one possible AP is available in scan results,
+        * could try the other ones before requesting a new scan.
+        */
+       wpa_supplicant_req_scan(wpa_s, timeout / 1000,
+                               1000 * (timeout % 1000));
+}
+
+
 void sme_authenticate(struct wpa_supplicant *wpa_s,
                      struct wpa_bss *bss, struct wpa_ssid *ssid)
 {
@@ -295,8 +366,10 @@ void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data)
                if (data->auth.status_code !=
                    WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG ||
                    wpa_s->sme.auth_alg == data->auth.auth_type ||
-                   wpa_s->current_ssid->auth_alg == WPA_AUTH_ALG_LEAP)
+                   wpa_s->current_ssid->auth_alg == WPA_AUTH_ALG_LEAP) {
+                       sme_connection_failed(wpa_s, wpa_s->pending_bssid);
                        return;
+               }
 
                switch (data->auth.auth_type) {
                case WLAN_AUTH_OPEN:
@@ -430,7 +503,6 @@ void sme_event_assoc_reject(struct wpa_supplicant *wpa_s,
                            union wpa_event_data *data)
 {
        int bssid_changed;
-       int timeout = 5000;
 
        wpa_printf(MSG_DEBUG, "SME: Association with " MACSTR " failed: "
                   "status code %d", MAC2STR(wpa_s->pending_bssid),
@@ -452,29 +524,12 @@ void sme_event_assoc_reject(struct wpa_supplicant *wpa_s,
        }
        wpa_s->sme.prev_bssid_set = 0;
 
-       if (wpa_blacklist_add(wpa_s, wpa_s->pending_bssid) == 0) {
-               struct wpa_blacklist *b;
-               b = wpa_blacklist_get(wpa_s, wpa_s->pending_bssid);
-               if (b && b->count < 3) {
-                       /*
-                        * Speed up next attempt if there could be other APs
-                        * that could accept association.
-                        */
-                       timeout = 100;
-               }
-       }
+       sme_connection_failed(wpa_s, wpa_s->pending_bssid);
        wpa_supplicant_set_state(wpa_s, WPA_DISCONNECTED);
        os_memset(wpa_s->bssid, 0, ETH_ALEN);
        os_memset(wpa_s->pending_bssid, 0, ETH_ALEN);
        if (bssid_changed)
                wpas_notify_bssid_changed(wpa_s);
-
-       /*
-        * TODO: if more than one possible AP is available in scan results,
-        * could try the other ones before requesting a new scan.
-        */
-       wpa_supplicant_req_scan(wpa_s, timeout / 1000,
-                               1000 * (timeout % 1000));
 }
 
 
@@ -482,7 +537,7 @@ void sme_event_auth_timed_out(struct wpa_supplicant *wpa_s,
                              union wpa_event_data *data)
 {
        wpa_printf(MSG_DEBUG, "SME: Authentication timed out");
-       wpa_supplicant_req_scan(wpa_s, 5, 0);
+       sme_connection_failed(wpa_s, wpa_s->pending_bssid);
 }
 
 
@@ -490,8 +545,8 @@ void sme_event_assoc_timed_out(struct wpa_supplicant *wpa_s,
                               union wpa_event_data *data)
 {
        wpa_printf(MSG_DEBUG, "SME: Association timed out");
+       sme_connection_failed(wpa_s, wpa_s->pending_bssid);
        wpa_supplicant_mark_disassoc(wpa_s);
-       wpa_supplicant_req_scan(wpa_s, 5, 0);
 }