Remove STA entry from AP when starting TKIP countermeasures

Previously, the STA entry was removed only from the driver and the STA
entry within hostapd was just marked disassociated. However, this left
the WPA authenticator state machine with an entry and the session was
not terminated properly. In addition, the STA entry could have remaining
indefinitely if the STA did not reconnect after TKIP countermeasures.
Fix this by removing the STA entry from hostapd instead of just leaving
it disassociated.

Signed-hostap: Jouni Malinen <j@w1.fi>

diff --git a/src/ap/tkip_countermeasures.c b/src/ap/tkip_countermeasures.c
index 60088ee5336e473b846033b5ef65ced9608b0bcb..dd5aa68790d69e8d3dfb1b409ca849545066e141 100644 (file)
--- a/src/ap/tkip_countermeasures.c
+++ b/src/ap/tkip_countermeasures.c
@@ -1,6 +1,6 @@
 /*
  * hostapd / TKIP countermeasures
- * Copyright (c) 2002-2011, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2002-2012, Jouni Malinen <j@w1.fi>
  *
  * This software may be distributed under the terms of the BSD license.
  * See README for more details.
@@ -11,6 +11,7 @@
 #include "utils/common.h"
 #include "utils/eloop.h"
 #include "common/ieee802_11_defs.h"
+#include "radius/radius.h"
 #include "hostapd.h"
 #include "sta_info.h"
 #include "ap_mlme.h"
@@ -44,12 +45,17 @@ static void ieee80211_tkip_countermeasures_start(struct hostapd_data *hapd)
        eloop_cancel_timeout(ieee80211_tkip_countermeasures_stop, hapd, NULL);
        eloop_register_timeout(60, 0, ieee80211_tkip_countermeasures_stop,
                               hapd, NULL);
-       for (sta = hapd->sta_list; sta != NULL; sta = sta->next) {
+       while ((sta = hapd->sta_list)) {
+               sta->acct_terminate_cause =
+                       RADIUS_ACCT_TERMINATE_CAUSE_ADMIN_RESET;
+               if (sta->flags & WLAN_STA_AUTH) {
+                       mlme_deauthenticate_indication(
+                               hapd, sta,
+                               WLAN_REASON_MICHAEL_MIC_FAILURE);
+               }
                hostapd_drv_sta_deauth(hapd, sta->addr,
                                       WLAN_REASON_MICHAEL_MIC_FAILURE);
-               ap_sta_set_authorized(hapd, sta, 0);
-               sta->flags &= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC);
-               hostapd_drv_sta_remove(hapd, sta->addr);
+               ap_free_sta(hapd, sta);
        }
 }