wlantest: Move Mgmt and Data frame processing into their own files

wlantest/Makefile

@@ -45,6 +45,8 @@ OBJS += wlantest.o
 OBJS += readpcap.o
 OBJS += monitor.o
 OBJS += process.o
+OBJS += rx_mgmt.o
+OBJS += rx_data.o
 OBJS += bss.o
 OBJS += sta.o
 OBJS += crc32.o

wlantest/process.c

@@ -18,534 +18,9 @@
 #include "utils/radiotap.h"
 #include "utils/radiotap_iter.h"
 #include "common/ieee802_11_defs.h"
-#include "common/ieee802_11_common.h"
 #include "wlantest.h"
 
 
-static const char * mgmt_stype(u16 stype)
-{
-	switch (stype) {
-	case WLAN_FC_STYPE_ASSOC_REQ:
-		return "ASSOC-REQ";
-	case WLAN_FC_STYPE_ASSOC_RESP:
-		return "ASSOC-RESP";
-	case WLAN_FC_STYPE_REASSOC_REQ:
-		return "REASSOC-REQ";
-	case WLAN_FC_STYPE_REASSOC_RESP:
-		return "REASSOC-RESP";
-	case WLAN_FC_STYPE_PROBE_REQ:
-		return "PROBE-REQ";
-	case WLAN_FC_STYPE_PROBE_RESP:
-		return "PROBE-RESP";
-	case WLAN_FC_STYPE_BEACON:
-		return "BEACON";
-	case WLAN_FC_STYPE_ATIM:
-		return "ATIM";
-	case WLAN_FC_STYPE_DISASSOC:
-		return "DISASSOC";
-	case WLAN_FC_STYPE_AUTH:
-		return "AUTH";
-	case WLAN_FC_STYPE_DEAUTH:
-		return "DEAUTH";
-	case WLAN_FC_STYPE_ACTION:
-		return "ACTION";
-	}
-	return "??";
-}
-
-
-static void rx_mgmt_beacon(struct wlantest *wt, const u8 *data, size_t len)
-{
-	const struct ieee80211_mgmt *mgmt;
-	struct wlantest_bss *bss;
-	struct ieee802_11_elems elems;
-
-	mgmt = (const struct ieee80211_mgmt *) data;
-	bss = bss_get(wt, mgmt->bssid);
-	if (bss == NULL)
-		return;
-	if (bss->proberesp_seen)
-		return; /* do not override with Beacon data */
-	bss->capab_info = le_to_host16(mgmt->u.beacon.capab_info);
-	if (ieee802_11_parse_elems(mgmt->u.beacon.variable,
-				   len - (mgmt->u.beacon.variable - data),
-				   &elems, 0) == ParseFailed) {
-		if (bss->parse_error_reported)
-			return;
-		wpa_printf(MSG_INFO, "Invalid IEs in a Beacon frame from "
-			   MACSTR, MAC2STR(mgmt->sa));
-		bss->parse_error_reported = 1;
-		return;
-	}
-
-	bss_update(bss, &elems);
-}
-
-
-static void rx_mgmt_probe_resp(struct wlantest *wt, const u8 *data, size_t len)
-{
-	const struct ieee80211_mgmt *mgmt;
-	struct wlantest_bss *bss;
-	struct ieee802_11_elems elems;
-
-	mgmt = (const struct ieee80211_mgmt *) data;
-	bss = bss_get(wt, mgmt->bssid);
-	if (bss == NULL)
-		return;
-
-	bss->capab_info = le_to_host16(mgmt->u.probe_resp.capab_info);
-	if (ieee802_11_parse_elems(mgmt->u.probe_resp.variable,
-				   len - (mgmt->u.probe_resp.variable - data),
-				   &elems, 0) == ParseFailed) {
-		if (bss->parse_error_reported)
-			return;
-		wpa_printf(MSG_INFO, "Invalid IEs in a Probe Response frame "
-			   "from " MACSTR, MAC2STR(mgmt->sa));
-		bss->parse_error_reported = 1;
-		return;
-	}
-
-	bss_update(bss, &elems);
-}
-
-
-static void rx_mgmt_auth(struct wlantest *wt, const u8 *data, size_t len)
-{
-	const struct ieee80211_mgmt *mgmt;
-	struct wlantest_bss *bss;
-	struct wlantest_sta *sta;
-	u16 alg, trans, status;
-
-	mgmt = (const struct ieee80211_mgmt *) data;
-	bss = bss_get(wt, mgmt->bssid);
-	if (bss == NULL)
-		return;
-	if (os_memcmp(mgmt->sa, mgmt->bssid, ETH_ALEN) == 0)
-		sta = sta_get(bss, mgmt->da);
-	else
-		sta = sta_get(bss, mgmt->sa);
-	if (sta == NULL)
-		return;
-
-	if (len < 24 + 6) {
-		wpa_printf(MSG_INFO, "Too short Authentication frame from "
-			   MACSTR, MAC2STR(mgmt->sa));
-		return;
-	}
-
-	alg = le_to_host16(mgmt->u.auth.auth_alg);
-	trans = le_to_host16(mgmt->u.auth.auth_transaction);
-	status = le_to_host16(mgmt->u.auth.status_code);
-
-	wpa_printf(MSG_DEBUG, "AUTH " MACSTR " -> " MACSTR
-		   " (alg=%u trans=%u status=%u)",
-		   MAC2STR(mgmt->sa), MAC2STR(mgmt->da), alg, trans, status);
-
-	if (alg == 0 && trans == 2 && status == 0) {
-		if (sta->state == STATE1) {
-			wpa_printf(MSG_DEBUG, "STA " MACSTR
-				   " moved to State 2 with " MACSTR,
-				   MAC2STR(sta->addr), MAC2STR(bss->bssid));
-			sta->state = STATE2;
-		}
-	}
-}
-
-
-static void rx_mgmt_deauth(struct wlantest *wt, const u8 *data, size_t len)
-{
-	const struct ieee80211_mgmt *mgmt;
-	struct wlantest_bss *bss;
-	struct wlantest_sta *sta;
-
-	mgmt = (const struct ieee80211_mgmt *) data;
-	bss = bss_get(wt, mgmt->bssid);
-	if (bss == NULL)
-		return;
-	if (os_memcmp(mgmt->sa, mgmt->bssid, ETH_ALEN) == 0)
-		sta = sta_get(bss, mgmt->da);
-	else
-		sta = sta_get(bss, mgmt->sa);
-	if (sta == NULL)
-		return;
-
-	if (len < 24 + 2) {
-		wpa_printf(MSG_INFO, "Too short Deauthentication frame from "
-			   MACSTR, MAC2STR(mgmt->sa));
-		return;
-	}
-
-	wpa_printf(MSG_DEBUG, "DEAUTH " MACSTR " -> " MACSTR
-		   " (reason=%u)",
-		   MAC2STR(mgmt->sa), MAC2STR(mgmt->da),
-		   le_to_host16(mgmt->u.deauth.reason_code));
-
-	if (sta->state != STATE1) {
-		wpa_printf(MSG_DEBUG, "STA " MACSTR
-			   " moved to State 1 with " MACSTR,
-			   MAC2STR(sta->addr), MAC2STR(bss->bssid));
-		sta->state = STATE1;
-	}
-}
-
-
-static void rx_mgmt_assoc_req(struct wlantest *wt, const u8 *data, size_t len)
-{
-	const struct ieee80211_mgmt *mgmt;
-	struct wlantest_bss *bss;
-	struct wlantest_sta *sta;
-
-	mgmt = (const struct ieee80211_mgmt *) data;
-	bss = bss_get(wt, mgmt->bssid);
-	if (bss == NULL)
-		return;
-	sta = sta_get(bss, mgmt->sa);
-	if (sta == NULL)
-		return;
-
-	if (len < 24 + 4) {
-		wpa_printf(MSG_INFO, "Too short Association Request frame "
-			   "from " MACSTR, MAC2STR(mgmt->sa));
-		return;
-	}
-
-	wpa_printf(MSG_DEBUG, "ASSOCREQ " MACSTR " -> " MACSTR
-		   " (capab=0x%x listen_int=%u)",
-		   MAC2STR(mgmt->sa), MAC2STR(mgmt->da),
-		   le_to_host16(mgmt->u.assoc_req.capab_info),
-		   le_to_host16(mgmt->u.assoc_req.listen_interval));
-}
-
-
-static void rx_mgmt_assoc_resp(struct wlantest *wt, const u8 *data, size_t len)
-{
-	const struct ieee80211_mgmt *mgmt;
-	struct wlantest_bss *bss;
-	struct wlantest_sta *sta;
-	u16 capab, status, aid;
-
-	mgmt = (const struct ieee80211_mgmt *) data;
-	bss = bss_get(wt, mgmt->bssid);
-	if (bss == NULL)
-		return;
-	sta = sta_get(bss, mgmt->da);
-	if (sta == NULL)
-		return;
-
-	if (len < 24 + 6) {
-		wpa_printf(MSG_INFO, "Too short Association Response frame "
-			   "from " MACSTR, MAC2STR(mgmt->sa));
-		return;
-	}
-
-	capab = le_to_host16(mgmt->u.assoc_resp.capab_info);
-	status = le_to_host16(mgmt->u.assoc_resp.status_code);
-	aid = le_to_host16(mgmt->u.assoc_resp.aid);
-
-	wpa_printf(MSG_DEBUG, "ASSOCRESP " MACSTR " -> " MACSTR
-		   " (capab=0x%x status=%u aid=%u)",
-		   MAC2STR(mgmt->sa), MAC2STR(mgmt->da), capab, status,
-		   aid & 0x3fff);
-
-	if (status)
-		return;
-
-	if ((aid & 0xc000) != 0xc000) {
-		wpa_printf(MSG_DEBUG, "Two MSBs of the AID were not set to 1 "
-			   "in Association Response from " MACSTR,
-			   MAC2STR(mgmt->sa));
-	}
-	sta->aid = aid & 0xc000;
-
-	if (sta->state < STATE2) {
-		wpa_printf(MSG_DEBUG, "STA " MACSTR " was not in State 2 when "
-			   "getting associated", MAC2STR(sta->addr));
-	}
-
-	if (sta->state < STATE3) {
-		wpa_printf(MSG_DEBUG, "STA " MACSTR
-			   " moved to State 3 with " MACSTR,
-			   MAC2STR(sta->addr), MAC2STR(bss->bssid));
-		sta->state = STATE3;
-	}
-}
-
-
-static void rx_mgmt_reassoc_req(struct wlantest *wt, const u8 *data,
-				size_t len)
-{
-	const struct ieee80211_mgmt *mgmt;
-	struct wlantest_bss *bss;
-	struct wlantest_sta *sta;
-
-	mgmt = (const struct ieee80211_mgmt *) data;
-	bss = bss_get(wt, mgmt->bssid);
-	if (bss == NULL)
-		return;
-	sta = sta_get(bss, mgmt->sa);
-	if (sta == NULL)
-		return;
-
-	if (len < 24 + 4 + ETH_ALEN) {
-		wpa_printf(MSG_INFO, "Too short Reassociation Request frame "
-			   "from " MACSTR, MAC2STR(mgmt->sa));
-		return;
-	}
-
-	wpa_printf(MSG_DEBUG, "REASSOCREQ " MACSTR " -> " MACSTR
-		   " (capab=0x%x listen_int=%u current_ap=" MACSTR ")",
-		   MAC2STR(mgmt->sa), MAC2STR(mgmt->da),
-		   le_to_host16(mgmt->u.reassoc_req.capab_info),
-		   le_to_host16(mgmt->u.reassoc_req.listen_interval),
-		   MAC2STR(mgmt->u.reassoc_req.current_ap));
-}
-
-
-static void rx_mgmt_reassoc_resp(struct wlantest *wt, const u8 *data,
-				 size_t len)
-{
-	const struct ieee80211_mgmt *mgmt;
-	struct wlantest_bss *bss;
-	struct wlantest_sta *sta;
-	u16 capab, status, aid;
-
-	mgmt = (const struct ieee80211_mgmt *) data;
-	bss = bss_get(wt, mgmt->bssid);
-	if (bss == NULL)
-		return;
-	sta = sta_get(bss, mgmt->da);
-	if (sta == NULL)
-		return;
-
-	if (len < 24 + 6) {
-		wpa_printf(MSG_INFO, "Too short Reassociation Response frame "
-			   "from " MACSTR, MAC2STR(mgmt->sa));
-		return;
-	}
-
-	capab = le_to_host16(mgmt->u.reassoc_resp.capab_info);
-	status = le_to_host16(mgmt->u.reassoc_resp.status_code);
-	aid = le_to_host16(mgmt->u.reassoc_resp.aid);
-
-	wpa_printf(MSG_DEBUG, "REASSOCRESP " MACSTR " -> " MACSTR
-		   " (capab=0x%x status=%u aid=%u)",
-		   MAC2STR(mgmt->sa), MAC2STR(mgmt->da), capab, status,
-		   aid & 0x3fff);
-
-	if (status)
-		return;
-
-	if ((aid & 0xc000) != 0xc000) {
-		wpa_printf(MSG_DEBUG, "Two MSBs of the AID were not set to 1 "
-			   "in Reassociation Response from " MACSTR,
-			   MAC2STR(mgmt->sa));
-	}
-	sta->aid = aid & 0xc000;
-
-	if (sta->state < STATE2) {
-		wpa_printf(MSG_DEBUG, "STA " MACSTR " was not in State 2 when "
-			   "getting associated", MAC2STR(sta->addr));
-	}
-
-	if (sta->state < STATE3) {
-		wpa_printf(MSG_DEBUG, "STA " MACSTR
-			   " moved to State 3 with " MACSTR,
-			   MAC2STR(sta->addr), MAC2STR(bss->bssid));
-		sta->state = STATE3;
-	}
-}
-
-
-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;
-
-	mgmt = (const struct ieee80211_mgmt *) data;
-	bss = bss_get(wt, mgmt->bssid);
-	if (bss == NULL)
-		return;
-	if (os_memcmp(mgmt->sa, mgmt->bssid, ETH_ALEN) == 0)
-		sta = sta_get(bss, mgmt->da);
-	else
-		sta = sta_get(bss, mgmt->sa);
-	if (sta == NULL)
-		return;
-
-	if (len < 24 + 2) {
-		wpa_printf(MSG_INFO, "Too short Disassociation frame from "
-			   MACSTR, MAC2STR(mgmt->sa));
-		return;
-	}
-
-	wpa_printf(MSG_DEBUG, "DISASSOC " MACSTR " -> " MACSTR
-		   " (reason=%u)",
-		   MAC2STR(mgmt->sa), MAC2STR(mgmt->da),
-		   le_to_host16(mgmt->u.disassoc.reason_code));
-
-	if (sta->state < STATE2) {
-		wpa_printf(MSG_DEBUG, "STA " MACSTR " was not in State 2 or 3 "
-			   "when getting disassociated", MAC2STR(sta->addr));
-	}
-
-	if (sta->state > STATE2) {
-		wpa_printf(MSG_DEBUG, "STA " MACSTR
-			   " moved to State 2 with " MACSTR,
-			   MAC2STR(sta->addr), MAC2STR(bss->bssid));
-		sta->state = STATE2;
-	}
-}
-
-
-static void rx_mgmt(struct wlantest *wt, const u8 *data, size_t len)
-{
-	const struct ieee80211_hdr *hdr;
-	u16 fc, stype;
-
-	if (len < 24)
-		return;
-
-	hdr = (const struct ieee80211_hdr *) data;
-	fc = le_to_host16(hdr->frame_control);
-	wt->rx_mgmt++;
-	stype = WLAN_FC_GET_STYPE(fc);
-
-	wpa_printf((stype == WLAN_FC_STYPE_BEACON ||
-		    stype == WLAN_FC_STYPE_PROBE_RESP ||
-		    stype == WLAN_FC_STYPE_PROBE_REQ) ?
-		   MSG_EXCESSIVE : MSG_MSGDUMP,
-		   "MGMT %s%s%s DA=" MACSTR " SA=" MACSTR " BSSID=" MACSTR,
-		   mgmt_stype(stype),
-		   fc & WLAN_FC_PWRMGT ? " PwrMgt" : "",
-		   fc & WLAN_FC_ISWEP ? " Prot" : "",
-		   MAC2STR(hdr->addr1), MAC2STR(hdr->addr2),
-		   MAC2STR(hdr->addr3));
-
-	switch (stype) {
-	case WLAN_FC_STYPE_BEACON:
-		rx_mgmt_beacon(wt, data, len);
-		break;
-	case WLAN_FC_STYPE_PROBE_RESP:
-		rx_mgmt_probe_resp(wt, data, len);
-		break;
-	case WLAN_FC_STYPE_AUTH:
-		rx_mgmt_auth(wt, data, len);
-		break;
-	case WLAN_FC_STYPE_DEAUTH:
-		rx_mgmt_deauth(wt, data, len);
-		break;
-	case WLAN_FC_STYPE_ASSOC_REQ:
-		rx_mgmt_assoc_req(wt, data, len);
-		break;
-	case WLAN_FC_STYPE_ASSOC_RESP:
-		rx_mgmt_assoc_resp(wt, data, len);
-		break;
-	case WLAN_FC_STYPE_REASSOC_REQ:
-		rx_mgmt_reassoc_req(wt, data, len);
-		break;
-	case WLAN_FC_STYPE_REASSOC_RESP:
-		rx_mgmt_reassoc_resp(wt, data, len);
-		break;
-	case WLAN_FC_STYPE_DISASSOC:
-		rx_mgmt_disassoc(wt, data, len);
-		break;
-	}
-}
-
-
-static const char * data_stype(u16 stype)
-{
-	switch (stype) {
-	case WLAN_FC_STYPE_DATA:
-		return "DATA";
-	case WLAN_FC_STYPE_DATA_CFACK:
-		return "DATA-CFACK";
-	case WLAN_FC_STYPE_DATA_CFPOLL:
-		return "DATA-CFPOLL";
-	case WLAN_FC_STYPE_DATA_CFACKPOLL:
-		return "DATA-CFACKPOLL";
-	case WLAN_FC_STYPE_NULLFUNC:
-		return "NULLFUNC";
-	case WLAN_FC_STYPE_CFACK:
-		return "CFACK";
-	case WLAN_FC_STYPE_CFPOLL:
-		return "CFPOLL";
-	case WLAN_FC_STYPE_CFACKPOLL:
-		return "CFACKPOLL";
-	case WLAN_FC_STYPE_QOS_DATA:
-		return "QOSDATA";
-	case WLAN_FC_STYPE_QOS_DATA_CFACK:
-		return "QOSDATA-CFACK";
-	case WLAN_FC_STYPE_QOS_DATA_CFPOLL:
-		return "QOSDATA-CFPOLL";
-	case WLAN_FC_STYPE_QOS_DATA_CFACKPOLL:
-		return "QOSDATA-CFACKPOLL";
-	case WLAN_FC_STYPE_QOS_NULL:
-		return "QOS-NULL";
-	case WLAN_FC_STYPE_QOS_CFPOLL:
-		return "QOS-CFPOLL";
-	case WLAN_FC_STYPE_QOS_CFACKPOLL:
-		return "QOS-CFACKPOLL";
-	}
-	return "??";
-}
-
-
-static void rx_data(struct wlantest *wt, const u8 *data, size_t len)
-{
-	const struct ieee80211_hdr *hdr;
-	u16 fc;
-
-	if (len < 24)
-		return;
-
-	hdr = (const struct ieee80211_hdr *) data;
-	fc = le_to_host16(hdr->frame_control);
-	wt->rx_data++;
-
-	switch (fc & (WLAN_FC_TODS | WLAN_FC_FROMDS)) {
-	case 0:
-		wpa_printf(MSG_EXCESSIVE, "DATA %s%s%s IBSS DA=" MACSTR " SA="
-			   MACSTR " BSSID=" MACSTR,
-			   data_stype(WLAN_FC_GET_STYPE(fc)),
-			   fc & WLAN_FC_PWRMGT ? " PwrMgt" : "",
-			   fc & WLAN_FC_ISWEP ? " Prot" : "",
-			   MAC2STR(hdr->addr1), MAC2STR(hdr->addr2),
-			   MAC2STR(hdr->addr3));
-		break;
-	case WLAN_FC_FROMDS:
-		wpa_printf(MSG_EXCESSIVE, "DATA %s%s%s FromDS DA=" MACSTR
-			   " BSSID=" MACSTR " SA=" MACSTR,
-			   data_stype(WLAN_FC_GET_STYPE(fc)),
-			   fc & WLAN_FC_PWRMGT ? " PwrMgt" : "",
-			   fc & WLAN_FC_ISWEP ? " Prot" : "",
-			   MAC2STR(hdr->addr1), MAC2STR(hdr->addr2),
-			   MAC2STR(hdr->addr3));
-		break;
-	case WLAN_FC_TODS:
-		wpa_printf(MSG_EXCESSIVE, "DATA %s%s%s ToDS BSSID=" MACSTR
-			   " SA=" MACSTR " DA=" MACSTR,
-			   data_stype(WLAN_FC_GET_STYPE(fc)),
-			   fc & WLAN_FC_PWRMGT ? " PwrMgt" : "",
-			   fc & WLAN_FC_ISWEP ? " Prot" : "",
-			   MAC2STR(hdr->addr1), MAC2STR(hdr->addr2),
-			   MAC2STR(hdr->addr3));
-		break;
-	case WLAN_FC_TODS | WLAN_FC_FROMDS:
-		wpa_printf(MSG_EXCESSIVE, "DATA %s%s%s WDS RA=" MACSTR " TA="
-			   MACSTR " DA=" MACSTR " SA=" MACSTR,
-			   data_stype(WLAN_FC_GET_STYPE(fc)),
-			   fc & WLAN_FC_PWRMGT ? " PwrMgt" : "",
-			   fc & WLAN_FC_ISWEP ? " Prot" : "",
-			   MAC2STR(hdr->addr1), MAC2STR(hdr->addr2),
-			   MAC2STR(hdr->addr3),
-			   MAC2STR((const u8 *) (hdr + 1)));
-		break;
-	}
-}
-
-
 static void rx_frame(struct wlantest *wt, const u8 *data, size_t len)
 {
 	const struct ieee80211_hdr *hdr;

wlantest/rx_data.c

@@ -0,0 +1,111 @@
+/*
+ * Received Data frame processing
+ * Copyright (c) 2010, Jouni Malinen <j@w1.fi>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Alternatively, this software may be distributed under the terms of BSD
+ * license.
+ *
+ * See README and COPYING for more details.
+ */
+
+#include "utils/includes.h"
+
+#include "utils/common.h"
+#include "common/ieee802_11_defs.h"
+#include "wlantest.h"
+
+
+static const char * data_stype(u16 stype)
+{
+	switch (stype) {
+	case WLAN_FC_STYPE_DATA:
+		return "DATA";
+	case WLAN_FC_STYPE_DATA_CFACK:
+		return "DATA-CFACK";
+	case WLAN_FC_STYPE_DATA_CFPOLL:
+		return "DATA-CFPOLL";
+	case WLAN_FC_STYPE_DATA_CFACKPOLL:
+		return "DATA-CFACKPOLL";
+	case WLAN_FC_STYPE_NULLFUNC:
+		return "NULLFUNC";
+	case WLAN_FC_STYPE_CFACK:
+		return "CFACK";
+	case WLAN_FC_STYPE_CFPOLL:
+		return "CFPOLL";
+	case WLAN_FC_STYPE_CFACKPOLL:
+		return "CFACKPOLL";
+	case WLAN_FC_STYPE_QOS_DATA:
+		return "QOSDATA";
+	case WLAN_FC_STYPE_QOS_DATA_CFACK:
+		return "QOSDATA-CFACK";
+	case WLAN_FC_STYPE_QOS_DATA_CFPOLL:
+		return "QOSDATA-CFPOLL";
+	case WLAN_FC_STYPE_QOS_DATA_CFACKPOLL:
+		return "QOSDATA-CFACKPOLL";
+	case WLAN_FC_STYPE_QOS_NULL:
+		return "QOS-NULL";
+	case WLAN_FC_STYPE_QOS_CFPOLL:
+		return "QOS-CFPOLL";
+	case WLAN_FC_STYPE_QOS_CFACKPOLL:
+		return "QOS-CFACKPOLL";
+	}
+	return "??";
+}
+
+
+void rx_data(struct wlantest *wt, const u8 *data, size_t len)
+{
+	const struct ieee80211_hdr *hdr;
+	u16 fc;
+
+	if (len < 24)
+		return;
+
+	hdr = (const struct ieee80211_hdr *) data;
+	fc = le_to_host16(hdr->frame_control);
+	wt->rx_data++;
+
+	switch (fc & (WLAN_FC_TODS | WLAN_FC_FROMDS)) {
+	case 0:
+		wpa_printf(MSG_EXCESSIVE, "DATA %s%s%s IBSS DA=" MACSTR " SA="
+			   MACSTR " BSSID=" MACSTR,
+			   data_stype(WLAN_FC_GET_STYPE(fc)),
+			   fc & WLAN_FC_PWRMGT ? " PwrMgt" : "",
+			   fc & WLAN_FC_ISWEP ? " Prot" : "",
+			   MAC2STR(hdr->addr1), MAC2STR(hdr->addr2),
+			   MAC2STR(hdr->addr3));
+		break;
+	case WLAN_FC_FROMDS:
+		wpa_printf(MSG_EXCESSIVE, "DATA %s%s%s FromDS DA=" MACSTR
+			   " BSSID=" MACSTR " SA=" MACSTR,
+			   data_stype(WLAN_FC_GET_STYPE(fc)),
+			   fc & WLAN_FC_PWRMGT ? " PwrMgt" : "",
+			   fc & WLAN_FC_ISWEP ? " Prot" : "",
+			   MAC2STR(hdr->addr1), MAC2STR(hdr->addr2),
+			   MAC2STR(hdr->addr3));
+		break;
+	case WLAN_FC_TODS:
+		wpa_printf(MSG_EXCESSIVE, "DATA %s%s%s ToDS BSSID=" MACSTR
+			   " SA=" MACSTR " DA=" MACSTR,
+			   data_stype(WLAN_FC_GET_STYPE(fc)),
+			   fc & WLAN_FC_PWRMGT ? " PwrMgt" : "",
+			   fc & WLAN_FC_ISWEP ? " Prot" : "",
+			   MAC2STR(hdr->addr1), MAC2STR(hdr->addr2),
+			   MAC2STR(hdr->addr3));
+		break;
+	case WLAN_FC_TODS | WLAN_FC_FROMDS:
+		wpa_printf(MSG_EXCESSIVE, "DATA %s%s%s WDS RA=" MACSTR " TA="
+			   MACSTR " DA=" MACSTR " SA=" MACSTR,
+			   data_stype(WLAN_FC_GET_STYPE(fc)),
+			   fc & WLAN_FC_PWRMGT ? " PwrMgt" : "",
+			   fc & WLAN_FC_ISWEP ? " Prot" : "",
+			   MAC2STR(hdr->addr1), MAC2STR(hdr->addr2),
+			   MAC2STR(hdr->addr3),
+			   MAC2STR((const u8 *) (hdr + 1)));
+		break;
+	}
+}

wlantest/rx_mgmt.c

@@ -0,0 +1,452 @@
+/*
+ * Received Management frame processing
+ * Copyright (c) 2010, Jouni Malinen <j@w1.fi>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Alternatively, this software may be distributed under the terms of BSD
+ * license.
+ *
+ * See README and COPYING for more details.
+ */
+
+#include "utils/includes.h"
+
+#include "utils/common.h"
+#include "common/ieee802_11_defs.h"
+#include "common/ieee802_11_common.h"
+#include "wlantest.h"
+
+
+static const char * mgmt_stype(u16 stype)
+{
+	switch (stype) {
+	case WLAN_FC_STYPE_ASSOC_REQ:
+		return "ASSOC-REQ";
+	case WLAN_FC_STYPE_ASSOC_RESP:
+		return "ASSOC-RESP";
+	case WLAN_FC_STYPE_REASSOC_REQ:
+		return "REASSOC-REQ";
+	case WLAN_FC_STYPE_REASSOC_RESP:
+		return "REASSOC-RESP";
+	case WLAN_FC_STYPE_PROBE_REQ:
+		return "PROBE-REQ";
+	case WLAN_FC_STYPE_PROBE_RESP:
+		return "PROBE-RESP";
+	case WLAN_FC_STYPE_BEACON:
+		return "BEACON";
+	case WLAN_FC_STYPE_ATIM:
+		return "ATIM";
+	case WLAN_FC_STYPE_DISASSOC:
+		return "DISASSOC";
+	case WLAN_FC_STYPE_AUTH:
+		return "AUTH";
+	case WLAN_FC_STYPE_DEAUTH:
+		return "DEAUTH";
+	case WLAN_FC_STYPE_ACTION:
+		return "ACTION";
+	}
+	return "??";
+}
+
+
+static void rx_mgmt_beacon(struct wlantest *wt, const u8 *data, size_t len)
+{
+	const struct ieee80211_mgmt *mgmt;
+	struct wlantest_bss *bss;
+	struct ieee802_11_elems elems;
+
+	mgmt = (const struct ieee80211_mgmt *) data;
+	bss = bss_get(wt, mgmt->bssid);
+	if (bss == NULL)
+		return;
+	if (bss->proberesp_seen)
+		return; /* do not override with Beacon data */
+	bss->capab_info = le_to_host16(mgmt->u.beacon.capab_info);
+	if (ieee802_11_parse_elems(mgmt->u.beacon.variable,
+				   len - (mgmt->u.beacon.variable - data),
+				   &elems, 0) == ParseFailed) {
+		if (bss->parse_error_reported)
+			return;
+		wpa_printf(MSG_INFO, "Invalid IEs in a Beacon frame from "
+			   MACSTR, MAC2STR(mgmt->sa));
+		bss->parse_error_reported = 1;
+		return;
+	}
+
+	bss_update(bss, &elems);
+}
+
+
+static void rx_mgmt_probe_resp(struct wlantest *wt, const u8 *data, size_t len)
+{
+	const struct ieee80211_mgmt *mgmt;
+	struct wlantest_bss *bss;
+	struct ieee802_11_elems elems;
+
+	mgmt = (const struct ieee80211_mgmt *) data;
+	bss = bss_get(wt, mgmt->bssid);
+	if (bss == NULL)
+		return;
+
+	bss->capab_info = le_to_host16(mgmt->u.probe_resp.capab_info);
+	if (ieee802_11_parse_elems(mgmt->u.probe_resp.variable,
+				   len - (mgmt->u.probe_resp.variable - data),
+				   &elems, 0) == ParseFailed) {
+		if (bss->parse_error_reported)
+			return;
+		wpa_printf(MSG_INFO, "Invalid IEs in a Probe Response frame "
+			   "from " MACSTR, MAC2STR(mgmt->sa));
+		bss->parse_error_reported = 1;
+		return;
+	}
+
+	bss_update(bss, &elems);
+}
+
+
+static void rx_mgmt_auth(struct wlantest *wt, const u8 *data, size_t len)
+{
+	const struct ieee80211_mgmt *mgmt;
+	struct wlantest_bss *bss;
+	struct wlantest_sta *sta;
+	u16 alg, trans, status;
+
+	mgmt = (const struct ieee80211_mgmt *) data;
+	bss = bss_get(wt, mgmt->bssid);
+	if (bss == NULL)
+		return;
+	if (os_memcmp(mgmt->sa, mgmt->bssid, ETH_ALEN) == 0)
+		sta = sta_get(bss, mgmt->da);
+	else
+		sta = sta_get(bss, mgmt->sa);
+	if (sta == NULL)
+		return;
+
+	if (len < 24 + 6) {
+		wpa_printf(MSG_INFO, "Too short Authentication frame from "
+			   MACSTR, MAC2STR(mgmt->sa));
+		return;
+	}
+
+	alg = le_to_host16(mgmt->u.auth.auth_alg);
+	trans = le_to_host16(mgmt->u.auth.auth_transaction);
+	status = le_to_host16(mgmt->u.auth.status_code);
+
+	wpa_printf(MSG_DEBUG, "AUTH " MACSTR " -> " MACSTR
+		   " (alg=%u trans=%u status=%u)",
+		   MAC2STR(mgmt->sa), MAC2STR(mgmt->da), alg, trans, status);
+
+	if (alg == 0 && trans == 2 && status == 0) {
+		if (sta->state == STATE1) {
+			wpa_printf(MSG_DEBUG, "STA " MACSTR
+				   " moved to State 2 with " MACSTR,
+				   MAC2STR(sta->addr), MAC2STR(bss->bssid));
+			sta->state = STATE2;
+		}
+	}
+}
+
+
+static void rx_mgmt_deauth(struct wlantest *wt, const u8 *data, size_t len)
+{
+	const struct ieee80211_mgmt *mgmt;
+	struct wlantest_bss *bss;
+	struct wlantest_sta *sta;
+
+	mgmt = (const struct ieee80211_mgmt *) data;
+	bss = bss_get(wt, mgmt->bssid);
+	if (bss == NULL)
+		return;
+	if (os_memcmp(mgmt->sa, mgmt->bssid, ETH_ALEN) == 0)
+		sta = sta_get(bss, mgmt->da);
+	else
+		sta = sta_get(bss, mgmt->sa);
+	if (sta == NULL)
+		return;
+
+	if (len < 24 + 2) {
+		wpa_printf(MSG_INFO, "Too short Deauthentication frame from "
+			   MACSTR, MAC2STR(mgmt->sa));
+		return;
+	}
+
+	wpa_printf(MSG_DEBUG, "DEAUTH " MACSTR " -> " MACSTR
+		   " (reason=%u)",
+		   MAC2STR(mgmt->sa), MAC2STR(mgmt->da),
+		   le_to_host16(mgmt->u.deauth.reason_code));
+
+	if (sta->state != STATE1) {
+		wpa_printf(MSG_DEBUG, "STA " MACSTR
+			   " moved to State 1 with " MACSTR,
+			   MAC2STR(sta->addr), MAC2STR(bss->bssid));
+		sta->state = STATE1;
+	}
+}
+
+
+static void rx_mgmt_assoc_req(struct wlantest *wt, const u8 *data, size_t len)
+{
+	const struct ieee80211_mgmt *mgmt;
+	struct wlantest_bss *bss;
+	struct wlantest_sta *sta;
+
+	mgmt = (const struct ieee80211_mgmt *) data;
+	bss = bss_get(wt, mgmt->bssid);
+	if (bss == NULL)
+		return;
+	sta = sta_get(bss, mgmt->sa);
+	if (sta == NULL)
+		return;
+
+	if (len < 24 + 4) {
+		wpa_printf(MSG_INFO, "Too short Association Request frame "
+			   "from " MACSTR, MAC2STR(mgmt->sa));
+		return;
+	}
+
+	wpa_printf(MSG_DEBUG, "ASSOCREQ " MACSTR " -> " MACSTR
+		   " (capab=0x%x listen_int=%u)",
+		   MAC2STR(mgmt->sa), MAC2STR(mgmt->da),
+		   le_to_host16(mgmt->u.assoc_req.capab_info),
+		   le_to_host16(mgmt->u.assoc_req.listen_interval));
+}
+
+
+static void rx_mgmt_assoc_resp(struct wlantest *wt, const u8 *data, size_t len)
+{
+	const struct ieee80211_mgmt *mgmt;
+	struct wlantest_bss *bss;
+	struct wlantest_sta *sta;
+	u16 capab, status, aid;
+
+	mgmt = (const struct ieee80211_mgmt *) data;
+	bss = bss_get(wt, mgmt->bssid);
+	if (bss == NULL)
+		return;
+	sta = sta_get(bss, mgmt->da);
+	if (sta == NULL)
+		return;
+
+	if (len < 24 + 6) {
+		wpa_printf(MSG_INFO, "Too short Association Response frame "
+			   "from " MACSTR, MAC2STR(mgmt->sa));
+		return;
+	}
+
+	capab = le_to_host16(mgmt->u.assoc_resp.capab_info);
+	status = le_to_host16(mgmt->u.assoc_resp.status_code);
+	aid = le_to_host16(mgmt->u.assoc_resp.aid);
+
+	wpa_printf(MSG_DEBUG, "ASSOCRESP " MACSTR " -> " MACSTR
+		   " (capab=0x%x status=%u aid=%u)",
+		   MAC2STR(mgmt->sa), MAC2STR(mgmt->da), capab, status,
+		   aid & 0x3fff);
+
+	if (status)
+		return;
+
+	if ((aid & 0xc000) != 0xc000) {
+		wpa_printf(MSG_DEBUG, "Two MSBs of the AID were not set to 1 "
+			   "in Association Response from " MACSTR,
+			   MAC2STR(mgmt->sa));
+	}
+	sta->aid = aid & 0xc000;
+
+	if (sta->state < STATE2) {
+		wpa_printf(MSG_DEBUG, "STA " MACSTR " was not in State 2 when "
+			   "getting associated", MAC2STR(sta->addr));
+	}
+
+	if (sta->state < STATE3) {
+		wpa_printf(MSG_DEBUG, "STA " MACSTR
+			   " moved to State 3 with " MACSTR,
+			   MAC2STR(sta->addr), MAC2STR(bss->bssid));
+		sta->state = STATE3;
+	}
+}
+
+
+static void rx_mgmt_reassoc_req(struct wlantest *wt, const u8 *data,
+				size_t len)
+{
+	const struct ieee80211_mgmt *mgmt;
+	struct wlantest_bss *bss;
+	struct wlantest_sta *sta;
+
+	mgmt = (const struct ieee80211_mgmt *) data;
+	bss = bss_get(wt, mgmt->bssid);
+	if (bss == NULL)
+		return;
+	sta = sta_get(bss, mgmt->sa);
+	if (sta == NULL)
+		return;
+
+	if (len < 24 + 4 + ETH_ALEN) {
+		wpa_printf(MSG_INFO, "Too short Reassociation Request frame "
+			   "from " MACSTR, MAC2STR(mgmt->sa));
+		return;
+	}
+
+	wpa_printf(MSG_DEBUG, "REASSOCREQ " MACSTR " -> " MACSTR
+		   " (capab=0x%x listen_int=%u current_ap=" MACSTR ")",
+		   MAC2STR(mgmt->sa), MAC2STR(mgmt->da),
+		   le_to_host16(mgmt->u.reassoc_req.capab_info),
+		   le_to_host16(mgmt->u.reassoc_req.listen_interval),
+		   MAC2STR(mgmt->u.reassoc_req.current_ap));
+}
+
+
+static void rx_mgmt_reassoc_resp(struct wlantest *wt, const u8 *data,
+				 size_t len)
+{
+	const struct ieee80211_mgmt *mgmt;
+	struct wlantest_bss *bss;
+	struct wlantest_sta *sta;
+	u16 capab, status, aid;
+
+	mgmt = (const struct ieee80211_mgmt *) data;
+	bss = bss_get(wt, mgmt->bssid);
+	if (bss == NULL)
+		return;
+	sta = sta_get(bss, mgmt->da);
+	if (sta == NULL)
+		return;
+
+	if (len < 24 + 6) {
+		wpa_printf(MSG_INFO, "Too short Reassociation Response frame "
+			   "from " MACSTR, MAC2STR(mgmt->sa));
+		return;
+	}
+
+	capab = le_to_host16(mgmt->u.reassoc_resp.capab_info);
+	status = le_to_host16(mgmt->u.reassoc_resp.status_code);
+	aid = le_to_host16(mgmt->u.reassoc_resp.aid);
+
+	wpa_printf(MSG_DEBUG, "REASSOCRESP " MACSTR " -> " MACSTR
+		   " (capab=0x%x status=%u aid=%u)",
+		   MAC2STR(mgmt->sa), MAC2STR(mgmt->da), capab, status,
+		   aid & 0x3fff);
+
+	if (status)
+		return;
+
+	if ((aid & 0xc000) != 0xc000) {
+		wpa_printf(MSG_DEBUG, "Two MSBs of the AID were not set to 1 "
+			   "in Reassociation Response from " MACSTR,
+			   MAC2STR(mgmt->sa));
+	}
+	sta->aid = aid & 0xc000;
+
+	if (sta->state < STATE2) {
+		wpa_printf(MSG_DEBUG, "STA " MACSTR " was not in State 2 when "
+			   "getting associated", MAC2STR(sta->addr));
+	}
+
+	if (sta->state < STATE3) {
+		wpa_printf(MSG_DEBUG, "STA " MACSTR
+			   " moved to State 3 with " MACSTR,
+			   MAC2STR(sta->addr), MAC2STR(bss->bssid));
+		sta->state = STATE3;
+	}
+}
+
+
+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;
+
+	mgmt = (const struct ieee80211_mgmt *) data;
+	bss = bss_get(wt, mgmt->bssid);
+	if (bss == NULL)
+		return;
+	if (os_memcmp(mgmt->sa, mgmt->bssid, ETH_ALEN) == 0)
+		sta = sta_get(bss, mgmt->da);
+	else
+		sta = sta_get(bss, mgmt->sa);
+	if (sta == NULL)
+		return;
+
+	if (len < 24 + 2) {
+		wpa_printf(MSG_INFO, "Too short Disassociation frame from "
+			   MACSTR, MAC2STR(mgmt->sa));
+		return;
+	}
+
+	wpa_printf(MSG_DEBUG, "DISASSOC " MACSTR " -> " MACSTR
+		   " (reason=%u)",
+		   MAC2STR(mgmt->sa), MAC2STR(mgmt->da),
+		   le_to_host16(mgmt->u.disassoc.reason_code));
+
+	if (sta->state < STATE2) {
+		wpa_printf(MSG_DEBUG, "STA " MACSTR " was not in State 2 or 3 "
+			   "when getting disassociated", MAC2STR(sta->addr));
+	}
+
+	if (sta->state > STATE2) {
+		wpa_printf(MSG_DEBUG, "STA " MACSTR
+			   " moved to State 2 with " MACSTR,
+			   MAC2STR(sta->addr), MAC2STR(bss->bssid));
+		sta->state = STATE2;
+	}
+}
+
+
+void rx_mgmt(struct wlantest *wt, const u8 *data, size_t len)
+{
+	const struct ieee80211_hdr *hdr;
+	u16 fc, stype;
+
+	if (len < 24)
+		return;
+
+	hdr = (const struct ieee80211_hdr *) data;
+	fc = le_to_host16(hdr->frame_control);
+	wt->rx_mgmt++;
+	stype = WLAN_FC_GET_STYPE(fc);
+
+	wpa_printf((stype == WLAN_FC_STYPE_BEACON ||
+		    stype == WLAN_FC_STYPE_PROBE_RESP ||
+		    stype == WLAN_FC_STYPE_PROBE_REQ) ?
+		   MSG_EXCESSIVE : MSG_MSGDUMP,
+		   "MGMT %s%s%s DA=" MACSTR " SA=" MACSTR " BSSID=" MACSTR,
+		   mgmt_stype(stype),
+		   fc & WLAN_FC_PWRMGT ? " PwrMgt" : "",
+		   fc & WLAN_FC_ISWEP ? " Prot" : "",
+		   MAC2STR(hdr->addr1), MAC2STR(hdr->addr2),
+		   MAC2STR(hdr->addr3));
+
+	switch (stype) {
+	case WLAN_FC_STYPE_BEACON:
+		rx_mgmt_beacon(wt, data, len);
+		break;
+	case WLAN_FC_STYPE_PROBE_RESP:
+		rx_mgmt_probe_resp(wt, data, len);
+		break;
+	case WLAN_FC_STYPE_AUTH:
+		rx_mgmt_auth(wt, data, len);
+		break;
+	case WLAN_FC_STYPE_DEAUTH:
+		rx_mgmt_deauth(wt, data, len);
+		break;
+	case WLAN_FC_STYPE_ASSOC_REQ:
+		rx_mgmt_assoc_req(wt, data, len);
+		break;
+	case WLAN_FC_STYPE_ASSOC_RESP:
+		rx_mgmt_assoc_resp(wt, data, len);
+		break;
+	case WLAN_FC_STYPE_REASSOC_REQ:
+		rx_mgmt_reassoc_req(wt, data, len);
+		break;
+	case WLAN_FC_STYPE_REASSOC_RESP:
+		rx_mgmt_reassoc_resp(wt, data, len);
+		break;
+	case WLAN_FC_STYPE_DISASSOC:
+		rx_mgmt_disassoc(wt, data, len);
+		break;
+	}
+}

wlantest/wlantest.h

@@ -60,6 +60,8 @@ void wlantest_process(struct wlantest *wt, const u8 *data, size_t len);
 u32 crc32(const u8 *frame, size_t frame_len);
 int monitor_init(struct wlantest *wt, const char *ifname);
 void monitor_deinit(struct wlantest *wt);
+void rx_mgmt(struct wlantest *wt, const u8 *data, size_t len);
+void rx_data(struct wlantest *wt, const u8 *data, size_t len);
 
 struct wlantest_bss * bss_get(struct wlantest *wt, const u8 *bssid);
 void bss_deinit(struct wlantest_bss *bss);