wlantest: Print BSSID for EAPOL-Key frames

The BSSID (RA/TA) might differ from SA/DA for the AP, so print it as
well in the debug entry for EAPOL-Key frames.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2023-01-10 11:50:40 +02:00 committed by Jouni Malinen
parent 0f3f9cdcab
commit 0ba17557ea

View file

@ -94,8 +94,9 @@ static void rx_data_eapol_key_1_of_4(struct wlantest *wt, const u8 *dst,
u16 key_data_len; u16 key_data_len;
struct wpa_eapol_ie_parse ie; struct wpa_eapol_ie_parse ie;
wpa_printf(MSG_DEBUG, "EAPOL-Key 1/4 " MACSTR " -> " MACSTR, wpa_printf(MSG_DEBUG, "EAPOL-Key 1/4 " MACSTR " -> " MACSTR " (BSSID "
MAC2STR(src), MAC2STR(dst)); MACSTR ")",
MAC2STR(src), MAC2STR(dst), MAC2STR(bssid));
if (os_memcmp(src, bssid, ETH_ALEN) == 0) { if (os_memcmp(src, bssid, ETH_ALEN) == 0) {
bss = bss_get(wt, src); bss = bss_get(wt, src);
} else { } else {
@ -340,8 +341,9 @@ static void rx_data_eapol_key_2_of_4(struct wlantest *wt, const u8 *dst,
struct wpa_eapol_ie_parse ie; struct wpa_eapol_ie_parse ie;
int link_id; int link_id;
wpa_printf(MSG_DEBUG, "EAPOL-Key 2/4 " MACSTR " -> " MACSTR, wpa_printf(MSG_DEBUG, "EAPOL-Key 2/4 " MACSTR " -> " MACSTR " (BSSID "
MAC2STR(src), MAC2STR(dst)); MACSTR ")",
MAC2STR(src), MAC2STR(dst), MAC2STR(bssid));
if (os_memcmp(dst, bssid, ETH_ALEN) == 0) { if (os_memcmp(dst, bssid, ETH_ALEN) == 0) {
bss = bss_get(wt, dst); bss = bss_get(wt, dst);
} else { } else {
@ -922,8 +924,9 @@ static void rx_data_eapol_key_3_of_4(struct wlantest *wt, const u8 *dst,
size_t rsne_len; size_t rsne_len;
int link_id; int link_id;
wpa_printf(MSG_DEBUG, "EAPOL-Key 3/4 " MACSTR " -> " MACSTR, wpa_printf(MSG_DEBUG, "EAPOL-Key 3/4 " MACSTR " -> " MACSTR " (BSSID "
MAC2STR(src), MAC2STR(dst)); MACSTR ")",
MAC2STR(src), MAC2STR(dst), MAC2STR(bssid));
if (os_memcmp(src, bssid, ETH_ALEN) == 0) { if (os_memcmp(src, bssid, ETH_ALEN) == 0) {
bss = bss_get(wt, src); bss = bss_get(wt, src);
} else { } else {
@ -1153,8 +1156,9 @@ static void rx_data_eapol_key_4_of_4(struct wlantest *wt, const u8 *dst,
const u8 *kck; const u8 *kck;
size_t kck_len; size_t kck_len;
wpa_printf(MSG_DEBUG, "EAPOL-Key 4/4 " MACSTR " -> " MACSTR, wpa_printf(MSG_DEBUG, "EAPOL-Key 4/4 " MACSTR " -> " MACSTR " (BSSID "
MAC2STR(src), MAC2STR(dst)); MACSTR ")",
MAC2STR(src), MAC2STR(dst), MAC2STR(bssid));
if (os_memcmp(dst, bssid, ETH_ALEN) == 0) { if (os_memcmp(dst, bssid, ETH_ALEN) == 0) {
bss = bss_get(wt, dst); bss = bss_get(wt, dst);
} else { } else {
@ -1223,8 +1227,9 @@ static void rx_data_eapol_key_1_of_2(struct wlantest *wt, const u8 *dst,
size_t decrypted_len = 0; size_t decrypted_len = 0;
size_t mic_len; size_t mic_len;
wpa_printf(MSG_DEBUG, "EAPOL-Key 1/2 " MACSTR " -> " MACSTR, wpa_printf(MSG_DEBUG, "EAPOL-Key 1/2 " MACSTR " -> " MACSTR " (BSSID "
MAC2STR(src), MAC2STR(dst)); MACSTR ")",
MAC2STR(src), MAC2STR(dst), MAC2STR(bssid));
if (os_memcmp(src, bssid, ETH_ALEN) == 0) { if (os_memcmp(src, bssid, ETH_ALEN) == 0) {
bss = bss_get(wt, src); bss = bss_get(wt, src);
} else { } else {
@ -1359,8 +1364,9 @@ static void rx_data_eapol_key_2_of_2(struct wlantest *wt, const u8 *dst,
const struct wpa_eapol_key *hdr; const struct wpa_eapol_key *hdr;
u16 key_info; u16 key_info;
wpa_printf(MSG_DEBUG, "EAPOL-Key 2/2 " MACSTR " -> " MACSTR, wpa_printf(MSG_DEBUG, "EAPOL-Key 2/2 " MACSTR " -> " MACSTR " (BSSID "
MAC2STR(src), MAC2STR(dst)); MACSTR ")",
MAC2STR(src), MAC2STR(dst), MAC2STR(bssid));
if (os_memcmp(dst, bssid, ETH_ALEN) == 0) { if (os_memcmp(dst, bssid, ETH_ALEN) == 0) {
bss = bss_get(wt, dst); bss = bss_get(wt, dst);
} else { } else {