[PATCH] monitor: indicate if the MPDU was invalid

James Prestwood
2024-01-02T13:03:59Z

If the frame was not parsed as an MPDU indicate this in iwmon. This
also adds handling to print probe requests.
---
monitor/nlmon.c | 43 ++++++++++++++++++++++++++++++++++---------
1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/monitor/nlmon.c b/monitor/nlmon.c
index ed40264b..6845ca53 100644
--- a/monitor/nlmon.c
+++ b/monitor/nlmon.c
@@ -5128,6 +5128,16 @@ static void print_probe_response(unsigned int level,
(const uint8_t *) mmpdu + len - resp->ies);
}

+static void print_probe_request(unsigned int level,
+ const struct mmpdu_header *mmpdu, size_t len)
+{
+ const struct mmpdu_probe_request *req = mmpdu_body(mmpdu);
+
+ print_attr(level, "Subtype: Probe Request");
+ print_ie(level + 1, "Probe Request IEs", req->ies,
+ (const uint8_t *) mmpdu + len - req->ies);
+}
+
static void print_beacon(unsigned int level,
const struct mmpdu_header *mmpdu, size_t len)
{
@@ -5165,7 +5175,10 @@ static void print_frame_type(unsigned int level, const char *label,

switch (subtype) {
case 0x00:
- str = "Association request";
+ if (mpdu)
+ str = "Association request";
+ else
+ str = "Association request (invalid MPDU)";
break;
case 0x01:
if (mpdu)
@@ -5174,19 +5187,28 @@ static void print_frame_type(unsigned int level, const char *label,
str = "Association response";
break;
case 0x02:
- str = "Reassociation request";
+ if (mpdu)
+ str = "Reassociation request";
+ else
+ str = "Reassociation request (invalid MPDU)";
break;
case 0x03:
- str = "Reassociation response";
+ if (mpdu)
+ str = "Reassociation response";
+ else
+ str = "Reassociation response (invalid MPDU)";
break;
case 0x04:
- str = "Probe request";
+ if (mpdu)
+ print_probe_request(level + 1, mpdu, size);
+ else
+ str = "Probe request (invalid MPDU)";
break;
case 0x05:
if (mpdu)
print_probe_response(level + 1, mpdu, size);
else
- str = "Probe response";
+ str = "Probe response (invalid MPDU)";
break;
case 0x06:
str = "Timing Advertisement";
@@ -5195,25 +5217,28 @@ static void print_frame_type(unsigned int level, const char *label,
if (mpdu)
print_beacon(level + 1, mpdu, size);
else
- str = "Beacon";
+ str = "Beacon (invalid MPDU)";
break;
case 0x09:
str = "ATIM";
break;
case 0x0a:
- str = "Disassociation";
+ if (mpdu)
+ str = "Disassociation";
+ else
+ str = "Disassociation (invalid MPDU)";
break;
case 0x0b:
if (mpdu)
print_authentication_mgmt_frame(level + 1, mpdu, size);
else
- str = "Authentication";
+ str = "Authentication (invalid MPDU)";
break;
case 0x0c:
if (mpdu)
print_deauthentication_mgmt_frame(level + 1, mpdu);
else
- str = "Deauthentication";
+ str = "Deauthentication (invalid MPDU)";
break;
case 0x0d:
case 0x0e:
--
2.34.1