Merge pull request #924 from gokulkumar792/print_meshid

IEEE 802.11: include the "Mesh ID" field while printing management frames

Author: mcr

print-802_11.c

@@ -236,6 +236,11 @@ struct tim_t {
 uint8_tbitmap[251];
 };
 
+struct meshid_t {
+u_intlength;
+u_charmeshid[33]; /* 32 + 1 for null */
+};
+
 #defineE_SSID0
 #defineE_RATES1
 #defineE_FH2
@@ -260,6 +265,7 @@ struct tim_t {
 /* reserved	19 */
 /* reserved	16 */
 /* reserved	16 */
+#define E_MESHID114
 
 
 struct mgmt_body_t {
@@ -287,6 +293,8 @@ struct mgmt_body_t {
 struct fh_tfh;
 inttim_present;
 struct tim_ttim;
+intmeshid_present;
+struct meshid_tmeshid;
 };
 
 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_INDEX76
 
 /*
@@ -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:

tests/TESTLIST

@@ -270,6 +270,7 @@ scps_invalid	scps_invalid.pcap	scps_invalid.out
 # IEEE 802.11 tests
 802.11_exthdr	ieee802.11_exthdr.pcap	ieee802.11_exthdr.out	-v
 802.11_rx-stbc	ieee802.11_rx-stbc.pcap	ieee802.11_rx-stbc.out
+802.11_meshid	ieee802.11_meshid.pcap	ieee802.11_meshid.out
 
 # OpenFlow tests
 of10_p3295-vv	of10_p3295.pcap	of10_p3295-vv.out	-vv

tests/ieee802.11_meshid.out

@@ -0,0 +1,3 @@
+ 1 12:20:37.867811 9526800862us tsft 6.0 Mb/s 5745 MHz 11a -34dBm signal [bit 22] Beacon () [6.0* 9.0 12.0* 18.0 24.0* 36.0 48.0 54.0 Mbit] IBSS CH: 149, PRIVACY (MESHID: 11s-mesh-network)
+ 2 12:20:38.357687 9527290733us tsft 6.0 Mb/s 5745 MHz 11a -38dBm signal [bit 22] Probe Request () [6.0 9.0 12.0 18.0 24.0 36.0 48.0 54.0 Mbit]
+ 3 12:20:38.358276 9527291378us tsft 6.0 Mb/s 5745 MHz 11a -34dBm signal [bit 22] Probe Response () [6.0* 9.0 12.0* 18.0 24.0* 36.0 48.0 54.0 Mbit] CH: 149, PRIVACY (MESHID: 11s-mesh-network)