wlantest: Fix handling of PTK rekeying

[mech_eap.git] / wlantest / rx_mgmt.c

diff --git a/wlantest/rx_mgmt.c b/wlantest/rx_mgmt.c
index 234de61..c7a9390 100644 (file)
--- a/wlantest/rx_mgmt.c
+++ b/wlantest/rx_mgmt.c
@@ -170,12 +170,27 @@ static void deauth_all_stas(struct wlantest_bss *bss)
 }
 
 
+static void tdls_link_down(struct wlantest_bss *bss, struct wlantest_sta *sta)
+{
+       struct wlantest_tdls *tdls;
+       dl_list_for_each(tdls, &bss->tdls, struct wlantest_tdls, list) {
+               if ((tdls->init == sta || tdls->resp == sta) && tdls->link_up)
+               {
+                       wpa_printf(MSG_DEBUG, "TDLS: Set link down based on "
+                                  "STA deauth/disassoc");
+                       tdls->link_up = 0;
+               }
+       }
+}
+
+
 static void rx_mgmt_deauth(struct wlantest *wt, const u8 *data, size_t len,
                           int valid)
 {
        const struct ieee80211_mgmt *mgmt;
        struct wlantest_bss *bss;
        struct wlantest_sta *sta;
+       u16 fc, reason;
 
        mgmt = (const struct ieee80211_mgmt *) data;
        bss = bss_get(wt, mgmt->bssid);
@@ -192,10 +207,11 @@ static void rx_mgmt_deauth(struct wlantest *wt, const u8 *data, size_t len,
                return;
        }
 
+       reason = le_to_host16(mgmt->u.deauth.reason_code);
        wpa_printf(MSG_DEBUG, "DEAUTH " MACSTR " -> " MACSTR
                   " (reason=%u) (valid=%d)",
                   MAC2STR(mgmt->sa), MAC2STR(mgmt->da),
-                  le_to_host16(mgmt->u.deauth.reason_code), valid);
+                  reason, valid);
        wpa_hexdump(MSG_MSGDUMP, "DEAUTH payload", data + 24, len - 24);
 
        if (sta == NULL) {
@@ -204,10 +220,20 @@ static void rx_mgmt_deauth(struct wlantest *wt, const u8 *data, size_t len,
                return;
        }
 
-       if (os_memcmp(mgmt->sa, mgmt->bssid, ETH_ALEN) == 0)
+       if (os_memcmp(mgmt->sa, mgmt->bssid, ETH_ALEN) == 0) {
                sta->counters[valid ? WLANTEST_STA_COUNTER_VALID_DEAUTH_RX :
                              WLANTEST_STA_COUNTER_INVALID_DEAUTH_RX]++;
-       else
+               if (sta->pwrmgt && !sta->pspoll)
+                       sta->counters[WLANTEST_STA_COUNTER_DEAUTH_RX_ASLEEP]++;
+               else
+                       sta->counters[WLANTEST_STA_COUNTER_DEAUTH_RX_AWAKE]++;
+
+               fc = le_to_host16(mgmt->frame_control);
+               if (!(fc & WLAN_FC_ISWEP) && reason == 6)
+                       sta->counters[WLANTEST_STA_COUNTER_DEAUTH_RX_RC6]++;
+               else if (!(fc & WLAN_FC_ISWEP) && reason == 7)
+                       sta->counters[WLANTEST_STA_COUNTER_DEAUTH_RX_RC7]++;
+       } else
                sta->counters[valid ? WLANTEST_STA_COUNTER_VALID_DEAUTH_TX :
                              WLANTEST_STA_COUNTER_INVALID_DEAUTH_TX]++;
 
@@ -224,6 +250,7 @@ static void rx_mgmt_deauth(struct wlantest *wt, const u8 *data, size_t len,
                           MAC2STR(sta->addr), MAC2STR(bss->bssid));
                sta->state = STATE1;
        }
+       tdls_link_down(bss, sta);
 }
 
 
@@ -317,10 +344,13 @@ static void rx_mgmt_assoc_resp(struct wlantest *wt, const u8 *data, size_t len)
                        wpa_printf(MSG_INFO, "Failed to parse IEs in "
                                   "AssocResp from " MACSTR,
                                   MAC2STR(mgmt->sa));
-               } else if (elems.timeout_int == 0 ||
-                          elems.timeout_int_len != 5) {
-                       wpa_printf(MSG_INFO, "No valid Timeout Interval IE in "
-                                  "AssocResp (status=30) from " MACSTR,
+               } else if (elems.timeout_int == NULL ||
+                          elems.timeout_int_len != 5 ||
+                          elems.timeout_int[0] !=
+                          WLAN_TIMEOUT_ASSOC_COMEBACK) {
+                       wpa_printf(MSG_INFO, "No valid Timeout Interval IE "
+                                  "with Assoc Comeback time in AssocResp "
+                                  "(status=30) from " MACSTR,
                                   MAC2STR(mgmt->sa));
                } else {
                        sta->counters[
@@ -446,10 +476,13 @@ static void rx_mgmt_reassoc_resp(struct wlantest *wt, const u8 *data,
                        wpa_printf(MSG_INFO, "Failed to parse IEs in "
                                   "ReassocResp from " MACSTR,
                                   MAC2STR(mgmt->sa));
-               } else if (elems.timeout_int == 0 ||
-                          elems.timeout_int_len != 5) {
-                       wpa_printf(MSG_INFO, "No valid Timeout Interval IE in "
-                                  "ReassocResp (status=30) from " MACSTR,
+               } else if (elems.timeout_int == NULL ||
+                          elems.timeout_int_len != 5 ||
+                          elems.timeout_int[0] !=
+                          WLAN_TIMEOUT_ASSOC_COMEBACK) {
+                       wpa_printf(MSG_INFO, "No valid Timeout Interval IE "
+                                  "with Assoc Comeback time in ReassocResp "
+                                  "(status=30) from " MACSTR,
                                   MAC2STR(mgmt->sa));
                } else {
                        sta->counters[
@@ -501,6 +534,7 @@ static void rx_mgmt_disassoc(struct wlantest *wt, const u8 *data, size_t len,
        const struct ieee80211_mgmt *mgmt;
        struct wlantest_bss *bss;
        struct wlantest_sta *sta;
+       u16 fc, reason;
 
        mgmt = (const struct ieee80211_mgmt *) data;
        bss = bss_get(wt, mgmt->bssid);
@@ -517,10 +551,11 @@ static void rx_mgmt_disassoc(struct wlantest *wt, const u8 *data, size_t len,
                return;
        }
 
+       reason = le_to_host16(mgmt->u.disassoc.reason_code);
        wpa_printf(MSG_DEBUG, "DISASSOC " MACSTR " -> " MACSTR
                   " (reason=%u) (valid=%d)",
                   MAC2STR(mgmt->sa), MAC2STR(mgmt->da),
-                  le_to_host16(mgmt->u.disassoc.reason_code), valid);
+                  reason, valid);
        wpa_hexdump(MSG_MSGDUMP, "DISASSOC payload", data + 24, len - 24);
 
        if (sta == NULL) {
@@ -529,10 +564,22 @@ static void rx_mgmt_disassoc(struct wlantest *wt, const u8 *data, size_t len,
                return;
        }
 
-       if (os_memcmp(mgmt->sa, mgmt->bssid, ETH_ALEN) == 0)
+       if (os_memcmp(mgmt->sa, mgmt->bssid, ETH_ALEN) == 0) {
                sta->counters[valid ? WLANTEST_STA_COUNTER_VALID_DISASSOC_RX :
                              WLANTEST_STA_COUNTER_INVALID_DISASSOC_RX]++;
-       else
+               if (sta->pwrmgt && !sta->pspoll)
+                       sta->counters[
+                               WLANTEST_STA_COUNTER_DISASSOC_RX_ASLEEP]++;
+               else
+                       sta->counters[
+                               WLANTEST_STA_COUNTER_DISASSOC_RX_AWAKE]++;
+
+               fc = le_to_host16(mgmt->frame_control);
+               if (!(fc & WLAN_FC_ISWEP) && reason == 6)
+                       sta->counters[WLANTEST_STA_COUNTER_DISASSOC_RX_RC6]++;
+               else if (!(fc & WLAN_FC_ISWEP) && reason == 7)
+                       sta->counters[WLANTEST_STA_COUNTER_DISASSOC_RX_RC7]++;
+       } else
                sta->counters[valid ? WLANTEST_STA_COUNTER_VALID_DISASSOC_TX :
                              WLANTEST_STA_COUNTER_INVALID_DISASSOC_TX]++;
 
@@ -554,6 +601,7 @@ static void rx_mgmt_disassoc(struct wlantest *wt, const u8 *data, size_t len,
                           MAC2STR(sta->addr), MAC2STR(bss->bssid));
                sta->state = STATE2;
        }
+       tdls_link_down(bss, sta);
 }