From 01b397dd9433dd3fb48af00573157b364439161a Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 7 Jan 2011 14:17:08 +0200 Subject: [PATCH] wlantest: Add more details for replay debug messages These make it easier to find the frame in question when looking at the capture in Wireshark. --- wlantest/rx_data.c | 18 ++++++++++++++---- wlantest/rx_mgmt.c | 9 +++++++-- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/wlantest/rx_data.c b/wlantest/rx_data.c index 0d74b089f..fc264acb8 100644 --- a/wlantest/rx_data.c +++ b/wlantest/rx_data.c @@ -156,8 +156,13 @@ static void rx_data_bss_prot_group(struct wlantest *wt, else ccmp_get_pn(pn, data); if (os_memcmp(pn, bss->rsc[keyid], 6) <= 0) { - wpa_printf(MSG_INFO, "CCMP/TKIP replay detected: SA=" MACSTR, - MAC2STR(hdr->addr2)); + u16 seq_ctrl = le_to_host16(hdr->seq_ctrl); + wpa_printf(MSG_INFO, "CCMP/TKIP replay detected: A1=" MACSTR + " A2=" MACSTR " A3=" MACSTR " seq=%u frag=%u", + MAC2STR(hdr->addr1), MAC2STR(hdr->addr2), + MAC2STR(hdr->addr3), + WLAN_GET_SEQ_SEQ(seq_ctrl), + WLAN_GET_SEQ_FRAG(seq_ctrl)); wpa_hexdump(MSG_INFO, "RX PN", pn, 6); wpa_hexdump(MSG_INFO, "RSC", bss->rsc[keyid], 6); } @@ -296,8 +301,13 @@ static void rx_data_bss_prot(struct wlantest *wt, else ccmp_get_pn(pn, data); if (os_memcmp(pn, rsc, 6) <= 0) { - wpa_printf(MSG_INFO, "CCMP/TKIP replay detected: SA=" MACSTR, - MAC2STR(hdr->addr2)); + u16 seq_ctrl = le_to_host16(hdr->seq_ctrl); + wpa_printf(MSG_INFO, "CCMP/TKIP replay detected: A1=" MACSTR + " A2=" MACSTR " A3=" MACSTR " seq=%u frag=%u", + MAC2STR(hdr->addr1), MAC2STR(hdr->addr2), + MAC2STR(hdr->addr3), + WLAN_GET_SEQ_SEQ(seq_ctrl), + WLAN_GET_SEQ_FRAG(seq_ctrl)); wpa_hexdump(MSG_INFO, "RX PN", pn, 6); wpa_hexdump(MSG_INFO, "RSC", rsc, 6); } diff --git a/wlantest/rx_mgmt.c b/wlantest/rx_mgmt.c index 8941129da..234de6103 100644 --- a/wlantest/rx_mgmt.c +++ b/wlantest/rx_mgmt.c @@ -881,8 +881,13 @@ static u8 * mgmt_ccmp_decrypt(struct wlantest *wt, const u8 *data, size_t len, ccmp_get_pn(pn, data + 24); if (os_memcmp(pn, rsc, 6) <= 0) { - wpa_printf(MSG_INFO, "CCMP/TKIP replay detected: SA=" MACSTR, - MAC2STR(hdr->addr2)); + u16 seq_ctrl = le_to_host16(hdr->seq_ctrl); + wpa_printf(MSG_INFO, "CCMP/TKIP replay detected: A1=" MACSTR + " A2=" MACSTR " A3=" MACSTR " seq=%u frag=%u", + MAC2STR(hdr->addr1), MAC2STR(hdr->addr2), + MAC2STR(hdr->addr3), + WLAN_GET_SEQ_SEQ(seq_ctrl), + WLAN_GET_SEQ_FRAG(seq_ctrl)); wpa_hexdump(MSG_INFO, "RX PN", pn, 6); wpa_hexdump(MSG_INFO, "RSC", rsc, 6); }