From 8945cc451fde346dea6b39a3e5b69642935a93b3 Mon Sep 17 00:00:00 2001 From: Bartosz Markowski Date: Sun, 25 Dec 2011 21:09:17 +0200 Subject: [PATCH] Add BSSID into blacklist and do not clean blacklist during countermeasures If scanning continues during TKIP countermeasures, try to avoid selecting the BSS that triggered the counter measures. --- wpa_supplicant/events.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 89c9c8d03..79136664f 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -788,7 +788,8 @@ wpa_supplicant_pick_network(struct wpa_supplicant *wpa_s, break; } - if (selected == NULL && wpa_s->blacklist) { + if (selected == NULL && wpa_s->blacklist && + !wpa_s->countermeasures) { wpa_dbg(wpa_s, MSG_DEBUG, "No APs found - clear " "blacklist and try again"); wpa_blacklist_clear(wpa_s); @@ -1675,6 +1676,9 @@ wpa_supplicant_event_michael_mic_failure(struct wpa_supplicant *wpa_s, /* initialize countermeasures */ wpa_s->countermeasures = 1; + + wpa_blacklist_add(wpa_s, wpa_s->bssid); + wpa_msg(wpa_s, MSG_WARNING, "TKIP countermeasures started"); /*