/*
* STA list
- * Copyright (c) 2010, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2010-2015, 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.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
*/
#include "utils/includes.h"
#include "utils/common.h"
#include "common/defs.h"
+#include "common/ieee802_11_defs.h"
#include "common/ieee802_11_common.h"
#include "wlantest.h"
-struct wlantest_sta * sta_get(struct wlantest_bss *bss, const u8 *addr)
+struct wlantest_sta * sta_find(struct wlantest_bss *bss, const u8 *addr)
{
struct wlantest_sta *sta;
- if (addr[0] & 0x01)
- return NULL; /* Skip group addressed frames */
-
dl_list_for_each(sta, &bss->sta, struct wlantest_sta, list) {
if (os_memcmp(sta->addr, addr, ETH_ALEN) == 0)
return sta;
}
+ return NULL;
+}
+
+
+struct wlantest_sta * sta_get(struct wlantest_bss *bss, const u8 *addr)
+{
+ struct wlantest_sta *sta;
+
+ if (addr[0] & 0x01)
+ return NULL; /* Skip group addressed frames */
+
+ sta = sta_find(bss, addr);
+ if (sta)
+ return sta;
+
sta = os_zalloc(sizeof(*sta));
if (sta == NULL)
return NULL;
+ os_memset(sta->seq_ctrl_to_sta, 0xff, sizeof(sta->seq_ctrl_to_sta));
+ os_memset(sta->seq_ctrl_to_ap, 0xff, sizeof(sta->seq_ctrl_to_ap));
sta->bss = bss;
os_memcpy(sta->addr, addr, ETH_ALEN);
dl_list_add(&bss->sta, &sta->list);
struct wpa_ie_data data;
struct wlantest_bss *bss = sta->bss;
+ if (elems->wpa_ie && !bss->wpaie[0]) {
+ wpa_printf(MSG_INFO, "WPA IE included in Association Request "
+ "frame from " MACSTR " even though BSS does not "
+ "use WPA - ignore IE",
+ MAC2STR(sta->addr));
+ elems->wpa_ie = NULL;
+ }
+
+ if (elems->rsn_ie && !bss->rsnie[0]) {
+ wpa_printf(MSG_INFO, "RSN IE included in Association Request "
+ "frame from " MACSTR " even though BSS does not "
+ "use RSN - ignore IE",
+ MAC2STR(sta->addr));
+ elems->rsn_ie = NULL;
+ }
+
+ if (elems->osen && !bss->osenie[0]) {
+ wpa_printf(MSG_INFO, "OSEN IE included in Association Request "
+ "frame from " MACSTR " even though BSS does not "
+ "use OSEN - ignore IE",
+ MAC2STR(sta->addr));
+ elems->osen = NULL;
+ }
+
if (elems->wpa_ie && elems->rsn_ie) {
wpa_printf(MSG_INFO, "Both WPA IE and RSN IE included in "
"Association Request frame from " MACSTR,
wpa_printf(MSG_INFO, "Failed to parse WPA IE from "
MACSTR, MAC2STR(sta->addr));
}
- } else
+ } else if (elems->osen) {
+ wpa_hexdump(MSG_DEBUG, "OSEN IE", elems->osen - 2,
+ elems->osen_len + 2);
+ os_memcpy(sta->osenie, elems->osen - 2, elems->osen_len + 2);
+ sta->proto = WPA_PROTO_OSEN;
+ sta->pairwise_cipher = WPA_CIPHER_CCMP;
+ sta->key_mgmt = WPA_KEY_MGMT_OSEN;
+ sta->rsn_capab = 0;
+ goto skip_rsn_wpa;
+ } else {
sta->rsnie[0] = 0;
+ sta->proto = 0;
+ sta->pairwise_cipher = 0;
+ sta->key_mgmt = 0;
+ sta->rsn_capab = 0;
+ if (sta->assocreq_capab_info & WLAN_CAPABILITY_PRIVACY)
+ sta->pairwise_cipher = WPA_CIPHER_WEP40;
+ goto skip_rsn_wpa;
+ }
sta->proto = data.proto;
sta->pairwise_cipher = data.pairwise_cipher;
"MFPR", MAC2STR(sta->addr), MAC2STR(bss->bssid));
}
+skip_rsn_wpa:
wpa_printf(MSG_INFO, "STA " MACSTR
- " proto=%s%s%s"
- "pairwise=%s%s%s%s"
- "key_mgmt=%s%s%s%s%s%s%s%s"
+ " proto=%s%s%s%s"
+ "pairwise=%s%s%s%s%s%s%s"
+ "key_mgmt=%s%s%s%s%s%s%s%s%s%s%s"
"rsn_capab=%s%s%s%s%s",
MAC2STR(sta->addr),
sta->proto == 0 ? "OPEN " : "",
sta->proto & WPA_PROTO_WPA ? "WPA " : "",
sta->proto & WPA_PROTO_RSN ? "WPA2 " : "",
+ sta->proto & WPA_PROTO_OSEN ? "OSEN " : "",
sta->pairwise_cipher == 0 ? "N/A " : "",
sta->pairwise_cipher & WPA_CIPHER_NONE ? "NONE " : "",
sta->pairwise_cipher & WPA_CIPHER_TKIP ? "TKIP " : "",
sta->pairwise_cipher & WPA_CIPHER_CCMP ? "CCMP " : "",
+ bss->pairwise_cipher & WPA_CIPHER_CCMP_256 ? "CCMP-256 " :
+ "",
+ bss->pairwise_cipher & WPA_CIPHER_GCMP ? "GCMP " : "",
+ bss->pairwise_cipher & WPA_CIPHER_GCMP_256 ? "GCMP-256 " :
+ "",
sta->key_mgmt == 0 ? "N/A " : "",
sta->key_mgmt & WPA_KEY_MGMT_IEEE8021X ? "EAP " : "",
sta->key_mgmt & WPA_KEY_MGMT_PSK ? "PSK " : "",
"EAP-SHA256 " : "",
sta->key_mgmt & WPA_KEY_MGMT_PSK_SHA256 ?
"PSK-SHA256 " : "",
+ sta->key_mgmt & WPA_KEY_MGMT_OSEN ? "OSEN " : "",
+ sta->key_mgmt & WPA_KEY_MGMT_IEEE8021X_SUITE_B ?
+ "EAP-SUITE-B " : "",
+ sta->key_mgmt & WPA_KEY_MGMT_IEEE8021X_SUITE_B_192 ?
+ "EAP-SUITE-B-192 " : "",
sta->rsn_capab & WPA_CAPABILITY_PREAUTH ? "PREAUTH " : "",
sta->rsn_capab & WPA_CAPABILITY_NO_PAIRWISE ?
"NO_PAIRWISE " : "",
projects / mech_eap.git / blobdiff