diff options
| author | Gokul Sivakumar <gokulkumar792@gmail.com> | 2021-07-04 18:24:19 +0530 |
|---|---|---|
| committer | Gokul Sivakumar <gokulkumar792@gmail.com> | 2021-08-22 11:08:57 +0530 |
| commit | 27823518622b8aaa7a91bf0cff0f5c284f6f0f55 (patch) | |
| tree | 09ebf1f04d39a616128ecf3d55d2009743e3343e | |
| parent | dcae3b01d76f9a040f2a6e3d2c861c25c2d60a73 (diff) | |
| download | tcpdump-27823518622b8aaa7a91bf0cff0f5c284f6f0f55.tar.gz | |
IEEE 802.11: include the "Mesh ID" field while printing management frames
In an 802.11s mesh network, on detecting that the Beacon and Probe Response
frames transmitted has a non-zero length "Mesh ID", print it.
| -rw-r--r-- | print-802_11.c | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/print-802_11.c b/print-802_11.c index d2f0f35b..5d9080cd 100644 --- a/print-802_11.c +++ b/print-802_11.c @@ -236,6 +236,11 @@ struct tim_t { uint8_t bitmap[251]; }; +struct meshid_t { + u_int length; + u_char meshid[33]; /* 32 + 1 for null */ +}; + #define E_SSID 0 #define E_RATES 1 #define E_FH 2 @@ -260,6 +265,7 @@ struct tim_t { /* reserved 19 */ /* reserved 16 */ /* reserved 16 */ +#define E_MESHID 114 struct mgmt_body_t { @@ -287,6 +293,8 @@ struct mgmt_body_t { struct fh_t fh; int tim_present; struct tim_t tim; + int meshid_present; + struct meshid_t meshid; }; struct ctrl_control_wrapper_hdr_t { @@ -420,6 +428,13 @@ struct meshcntl_t { ND_PRINT("%s", \ CAPABILITY_PRIVACY(p.capability_info) ? ", PRIVACY" : ""); +#define PRINT_MESHID(p) \ + if (p.meshid_present) { \ + ND_PRINT(" (MESHID: "); \ + fn_print_str(ndo, p.meshid.meshid); \ + ND_PRINT(")"); \ + } + #define MAX_MCS_INDEX 76 /* @@ -1138,6 +1153,7 @@ parse_elements(netdissect_options *ndo, struct ds_t ds; struct cf_t cf; struct tim_t tim; + struct meshid_t meshid; /* * We haven't seen any elements yet. @@ -1148,6 +1164,7 @@ parse_elements(netdissect_options *ndo, pbody->ds_present = 0; pbody->cf_present = 0; pbody->tim_present = 0; + pbody->meshid_present = 0; while (length != 0) { /* Make sure we at least have the element ID and length. */ @@ -1336,6 +1353,30 @@ parse_elements(netdissect_options *ndo, pbody->tim_present = 1; } break; + case E_MESHID: + meshid.length = elementlen; + offset += 2; + length -= 2; + if (meshid.length != 0) { + if (meshid.length > sizeof(meshid.meshid) - 1) + return 0; + memcpy(&meshid.meshid, p + offset, meshid.length); + offset += meshid.length; + length -= meshid.length; + } + meshid.meshid[meshid.length] = '\0'; + /* + * Present and not truncated. + * + * If we haven't already seen a MESHID IE, + * copy this one, otherwise ignore this one, + * so we later report the first one we saw. + */ + if (!pbody->meshid_present) { + pbody->meshid = meshid; + pbody->meshid_present = 1; + } + break; default: #if 0 ND_PRINT("(1) unhandled element_id (%u) ", @@ -1389,6 +1430,7 @@ handle_beacon(netdissect_options *ndo, ND_PRINT(" %s", CAPABILITY_ESS(pbody.capability_info) ? "ESS" : "IBSS"); PRINT_DS_CHANNEL(pbody); + PRINT_MESHID(pbody); return ret; trunc: @@ -1553,6 +1595,7 @@ handle_probe_response(netdissect_options *ndo, PRINT_SSID(pbody); PRINT_RATES(pbody); PRINT_DS_CHANNEL(pbody); + PRINT_MESHID(pbody); return ret; trunc: |