X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/16add3e4ca711d436a82f166c800c52febaea8a4..a8c33a5850cd9d2f39e56c06b645c283225d78c4:/print-802_11.c diff --git a/print-802_11.c b/print-802_11.c index 6c052e23..8ddba1e3 100644 --- a/print-802_11.c +++ b/print-802_11.c @@ -75,22 +75,22 @@ #define T_DATA 0x2 /* data */ #define T_RESV 0x3 /* reserved */ -#define ST_ASSOC_REQUEST 0x0 -#define ST_ASSOC_RESPONSE 0x1 -#define ST_REASSOC_REQUEST 0x2 -#define ST_REASSOC_RESPONSE 0x3 -#define ST_PROBE_REQUEST 0x4 -#define ST_PROBE_RESPONSE 0x5 -/* RESERVED 0x6 */ -/* RESERVED 0x7 */ -#define ST_BEACON 0x8 +#define ST_ASSOC_REQUEST 0x0 +#define ST_ASSOC_RESPONSE 0x1 +#define ST_REASSOC_REQUEST 0x2 +#define ST_REASSOC_RESPONSE 0x3 +#define ST_PROBE_REQUEST 0x4 +#define ST_PROBE_RESPONSE 0x5 +/* RESERVED 0x6 */ +/* RESERVED 0x7 */ +#define ST_BEACON 0x8 #define ST_ATIM 0x9 #define ST_DISASSOC 0xA #define ST_AUTH 0xB #define ST_DEAUTH 0xC #define ST_ACTION 0xD -/* RESERVED 0xE */ -/* RESERVED 0xF */ +/* RESERVED 0xE */ +/* RESERVED 0xF */ static const struct tok st_str[] = { { ST_ASSOC_REQUEST, "Assoc Request" }, @@ -175,7 +175,7 @@ static const struct tok ctrl_str[] = { struct mgmt_header_t { nd_uint16_t fc; - nd_uint16_t duration; + nd_uint16_t duration; nd_mac_addr da; nd_mac_addr sa; nd_mac_addr bssid; @@ -215,7 +215,7 @@ struct fh_t { uint8_t length; uint16_t dwell_time; uint8_t hop_set; - uint8_t hop_pattern; + uint8_t hop_pattern; uint8_t hop_index; }; @@ -243,38 +243,38 @@ struct tim_t { uint8_t bitmap[251]; }; -#define E_SSID 0 -#define E_RATES 1 +#define E_SSID 0 +#define E_RATES 1 #define E_FH 2 -#define E_DS 3 +#define E_DS 3 #define E_CF 4 #define E_TIM 5 -#define E_IBSS 6 -/* reserved 7 */ -/* reserved 8 */ -/* reserved 9 */ -/* reserved 10 */ -/* reserved 11 */ -/* reserved 12 */ -/* reserved 13 */ -/* reserved 14 */ -/* reserved 15 */ -/* reserved 16 */ - -#define E_CHALLENGE 16 -/* reserved 17 */ -/* reserved 18 */ -/* reserved 19 */ -/* reserved 16 */ -/* reserved 16 */ +#define E_IBSS 6 +/* reserved 7 */ +/* reserved 8 */ +/* reserved 9 */ +/* reserved 10 */ +/* reserved 11 */ +/* reserved 12 */ +/* reserved 13 */ +/* reserved 14 */ +/* reserved 15 */ +/* reserved 16 */ + +#define E_CHALLENGE 16 +/* reserved 17 */ +/* reserved 18 */ +/* reserved 19 */ +/* reserved 16 */ +/* reserved 16 */ struct mgmt_body_t { - uint8_t timestamp[IEEE802_11_TSTAMP_LEN]; - uint16_t beacon_interval; - uint16_t listen_interval; - uint16_t status_code; - uint16_t aid; + uint8_t timestamp[IEEE802_11_TSTAMP_LEN]; + uint16_t beacon_interval; + uint16_t listen_interval; + uint16_t status_code; + uint16_t aid; u_char ap[IEEE802_11_AP_LEN]; uint16_t reason_code; uint16_t auth_alg; @@ -285,7 +285,7 @@ struct mgmt_body_t { int ssid_present; struct ssid_t ssid; int rates_present; - struct rates_t rates; + struct rates_t rates; int ds_present; struct ds_t ds; int cf_present; @@ -913,7 +913,7 @@ static const char *status_text[] = { static const char *reason_text[] = { "Reserved", /* 0 */ "Unspecified reason", /* 1 */ - "Previous authentication no longer valid", /* 2 */ + "Previous authentication no longer valid", /* 2 */ "Deauthenticated because sending station is leaving (or has left) " "IBSS or ESS", /* 3 */ "Disassociated due to inactivity", /* 4 */ @@ -956,7 +956,7 @@ static const char *reason_text[] = { "Disassociated because QoS AP lacks sufficient bandwidth for this " "QoS STA", /* 33 */ "Disassociated because of excessive number of frames that need to be " - "acknowledged, but are not acknowledged for AP transmissions " + "acknowledged, but are not acknowledged for AP transmissions " "and/or poor channel conditions", /* 34 */ "Disassociated because STA is transmitting outside the limits " "of its TXOPs", /* 35 */ @@ -980,24 +980,25 @@ static const char *reason_text[] = { static int wep_print(netdissect_options *ndo, - const u_char *p) + const u_char *p) { uint32_t iv; - if (!ND_TTEST_LEN(p, IEEE802_11_IV_LEN + IEEE802_11_KID_LEN)) - return 0; - iv = EXTRACT_LE_U_4(p); + ND_TCHECK_LEN(p, IEEE802_11_IV_LEN + IEEE802_11_KID_LEN); + iv = GET_LE_U_4(p); ND_PRINT(" IV:%3x Pad %x KeyID %x", IV_IV(iv), IV_PAD(iv), IV_KEYID(iv)); return 1; +trunc: + return 0; } static int parse_elements(netdissect_options *ndo, - struct mgmt_body_t *pbody, const u_char *p, int offset, - u_int length) + struct mgmt_body_t *pbody, const u_char *p, int offset, + u_int length) { u_int elementlen; struct ssid_t ssid; @@ -1019,19 +1020,17 @@ parse_elements(netdissect_options *ndo, while (length != 0) { /* Make sure we at least have the element ID and length. */ - if (!ND_TTEST_2(p + offset)) - return 0; + ND_TCHECK_2(p + offset); if (length < 2) - return 0; - elementlen = EXTRACT_U_1(p + offset + 1); + goto trunc; + elementlen = GET_U_1(p + offset + 1); /* Make sure we have the entire element. */ - if (!ND_TTEST_LEN(p + offset + 2, elementlen)) - return 0; + ND_TCHECK_LEN(p + offset + 2, elementlen); if (length < elementlen + 2) - return 0; + goto trunc; - switch (EXTRACT_U_1(p + offset)) { + switch (GET_U_1(p + offset)) { case E_SSID: memcpy(&ssid, p + offset, 2); offset += 2; @@ -1123,7 +1122,7 @@ parse_elements(netdissect_options *ndo, length -= ds.length; break; } - ds.channel = EXTRACT_U_1(p + offset); + ds.channel = GET_U_1(p + offset); offset += 1; length -= 1; /* @@ -1195,7 +1194,7 @@ parse_elements(netdissect_options *ndo, default: #if 0 ND_PRINT("(1) unhandled element_id (%u) ", - EXTRACT_U_1(p + offset)); + GET_U_1(p + offset)); #endif offset += 2 + elementlen; length -= 2 + elementlen; @@ -1205,6 +1204,8 @@ parse_elements(netdissect_options *ndo, /* No problems found. */ return 1; +trunc: + return 0; } /********************************************************************************* @@ -1213,7 +1214,7 @@ parse_elements(netdissect_options *ndo, static int handle_beacon(netdissect_options *ndo, - const u_char *p, u_int length) + const u_char *p, u_int length) { struct mgmt_body_t pbody; int offset = 0; @@ -1221,18 +1222,18 @@ handle_beacon(netdissect_options *ndo, memset(&pbody, 0, sizeof(pbody)); - if (!ND_TTEST_LEN(p, IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN + IEEE802_11_CAPINFO_LEN)) - return 0; + ND_TCHECK_LEN(p, IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN + + IEEE802_11_CAPINFO_LEN); if (length < IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN + IEEE802_11_CAPINFO_LEN) - return 0; + goto trunc; memcpy(&pbody.timestamp, p, IEEE802_11_TSTAMP_LEN); offset += IEEE802_11_TSTAMP_LEN; length -= IEEE802_11_TSTAMP_LEN; - pbody.beacon_interval = EXTRACT_LE_U_2(p + offset); + pbody.beacon_interval = GET_LE_U_2(p + offset); offset += IEEE802_11_BCNINT_LEN; length -= IEEE802_11_BCNINT_LEN; - pbody.capability_info = EXTRACT_LE_U_2(p + offset); + pbody.capability_info = GET_LE_U_2(p + offset); offset += IEEE802_11_CAPINFO_LEN; length -= IEEE802_11_CAPINFO_LEN; @@ -1245,11 +1246,13 @@ handle_beacon(netdissect_options *ndo, PRINT_DS_CHANNEL(pbody); return ret; +trunc: + return 0; } static int handle_assoc_request(netdissect_options *ndo, - const u_char *p, u_int length) + const u_char *p, u_int length) { struct mgmt_body_t pbody; int offset = 0; @@ -1257,14 +1260,13 @@ handle_assoc_request(netdissect_options *ndo, memset(&pbody, 0, sizeof(pbody)); - if (!ND_TTEST_LEN(p, IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN)) - return 0; + ND_TCHECK_LEN(p, IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN); if (length < IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN) - return 0; - pbody.capability_info = EXTRACT_LE_U_2(p); + goto trunc; + pbody.capability_info = GET_LE_U_2(p); offset += IEEE802_11_CAPINFO_LEN; length -= IEEE802_11_CAPINFO_LEN; - pbody.listen_interval = EXTRACT_LE_U_2(p + offset); + pbody.listen_interval = GET_LE_U_2(p + offset); offset += IEEE802_11_LISTENINT_LEN; length -= IEEE802_11_LISTENINT_LEN; @@ -1273,11 +1275,13 @@ handle_assoc_request(netdissect_options *ndo, PRINT_SSID(pbody); PRINT_RATES(pbody); return ret; +trunc: + return 0; } static int handle_assoc_response(netdissect_options *ndo, - const u_char *p, u_int length) + const u_char *p, u_int length) { struct mgmt_body_t pbody; int offset = 0; @@ -1285,18 +1289,18 @@ handle_assoc_response(netdissect_options *ndo, memset(&pbody, 0, sizeof(pbody)); - if (!ND_TTEST_LEN(p, IEEE802_11_CAPINFO_LEN + IEEE802_11_STATUS_LEN + IEEE802_11_AID_LEN)) - return 0; + ND_TCHECK_LEN(p, IEEE802_11_CAPINFO_LEN + IEEE802_11_STATUS_LEN + + IEEE802_11_AID_LEN); if (length < IEEE802_11_CAPINFO_LEN + IEEE802_11_STATUS_LEN + IEEE802_11_AID_LEN) - return 0; - pbody.capability_info = EXTRACT_LE_U_2(p); + goto trunc; + pbody.capability_info = GET_LE_U_2(p); offset += IEEE802_11_CAPINFO_LEN; length -= IEEE802_11_CAPINFO_LEN; - pbody.status_code = EXTRACT_LE_U_2(p + offset); + pbody.status_code = GET_LE_U_2(p + offset); offset += IEEE802_11_STATUS_LEN; length -= IEEE802_11_STATUS_LEN; - pbody.aid = EXTRACT_LE_U_2(p + offset); + pbody.aid = GET_LE_U_2(p + offset); offset += IEEE802_11_AID_LEN; length -= IEEE802_11_AID_LEN; @@ -1309,11 +1313,13 @@ handle_assoc_response(netdissect_options *ndo, : "n/a")); return ret; +trunc: + return 0; } static int handle_reassoc_request(netdissect_options *ndo, - const u_char *p, u_int length) + const u_char *p, u_int length) { struct mgmt_body_t pbody; int offset = 0; @@ -1321,15 +1327,15 @@ handle_reassoc_request(netdissect_options *ndo, memset(&pbody, 0, sizeof(pbody)); - if (!ND_TTEST_LEN(p, IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN + IEEE802_11_AP_LEN)) - return 0; + ND_TCHECK_LEN(p, IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN + + IEEE802_11_AP_LEN); if (length < IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN + IEEE802_11_AP_LEN) - return 0; - pbody.capability_info = EXTRACT_LE_U_2(p); + goto trunc; + pbody.capability_info = GET_LE_U_2(p); offset += IEEE802_11_CAPINFO_LEN; length -= IEEE802_11_CAPINFO_LEN; - pbody.listen_interval = EXTRACT_LE_U_2(p + offset); + pbody.listen_interval = GET_LE_U_2(p + offset); offset += IEEE802_11_LISTENINT_LEN; length -= IEEE802_11_LISTENINT_LEN; memcpy(&pbody.ap, p+offset, IEEE802_11_AP_LEN); @@ -1342,11 +1348,13 @@ handle_reassoc_request(netdissect_options *ndo, ND_PRINT(" AP : %s", etheraddr_string(ndo, pbody.ap )); return ret; +trunc: + return 0; } static int handle_reassoc_response(netdissect_options *ndo, - const u_char *p, u_int length) + const u_char *p, u_int length) { /* Same as a Association Response */ return handle_assoc_response(ndo, p, length); @@ -1354,7 +1362,7 @@ handle_reassoc_response(netdissect_options *ndo, static int handle_probe_request(netdissect_options *ndo, - const u_char *p, u_int length) + const u_char *p, u_int length) { struct mgmt_body_t pbody; int offset = 0; @@ -1372,7 +1380,7 @@ handle_probe_request(netdissect_options *ndo, static int handle_probe_response(netdissect_options *ndo, - const u_char *p, u_int length) + const u_char *p, u_int length) { struct mgmt_body_t pbody; int offset = 0; @@ -1380,18 +1388,18 @@ handle_probe_response(netdissect_options *ndo, memset(&pbody, 0, sizeof(pbody)); - if (!ND_TTEST_LEN(p, IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN + IEEE802_11_CAPINFO_LEN)) - return 0; + ND_TCHECK_LEN(p, IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN + + IEEE802_11_CAPINFO_LEN); if (length < IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN + IEEE802_11_CAPINFO_LEN) - return 0; + goto trunc; memcpy(&pbody.timestamp, p, IEEE802_11_TSTAMP_LEN); offset += IEEE802_11_TSTAMP_LEN; length -= IEEE802_11_TSTAMP_LEN; - pbody.beacon_interval = EXTRACT_LE_U_2(p + offset); + pbody.beacon_interval = GET_LE_U_2(p + offset); offset += IEEE802_11_BCNINT_LEN; length -= IEEE802_11_BCNINT_LEN; - pbody.capability_info = EXTRACT_LE_U_2(p + offset); + pbody.capability_info = GET_LE_U_2(p + offset); offset += IEEE802_11_CAPINFO_LEN; length -= IEEE802_11_CAPINFO_LEN; @@ -1402,6 +1410,8 @@ handle_probe_response(netdissect_options *ndo, PRINT_DS_CHANNEL(pbody); return ret; +trunc: + return 0; } static int @@ -1413,17 +1423,16 @@ handle_atim(void) static int handle_disassoc(netdissect_options *ndo, - const u_char *p, u_int length) + const u_char *p, u_int length) { struct mgmt_body_t pbody; memset(&pbody, 0, sizeof(pbody)); - if (!ND_TTEST_LEN(p, IEEE802_11_REASON_LEN)) - return 0; + ND_TCHECK_LEN(p, IEEE802_11_REASON_LEN); if (length < IEEE802_11_REASON_LEN) - return 0; - pbody.reason_code = EXTRACT_LE_U_2(p); + goto trunc; + pbody.reason_code = GET_LE_U_2(p); ND_PRINT(": %s", (pbody.reason_code < NUM_REASONS) @@ -1431,11 +1440,13 @@ handle_disassoc(netdissect_options *ndo, : "Reserved"); return 1; +trunc: + return 0; } static int handle_auth(netdissect_options *ndo, - const u_char *p, u_int length) + const u_char *p, u_int length) { struct mgmt_body_t pbody; int offset = 0; @@ -1443,17 +1454,16 @@ handle_auth(netdissect_options *ndo, memset(&pbody, 0, sizeof(pbody)); - if (!ND_TTEST_6(p)) - return 0; + ND_TCHECK_6(p); if (length < 6) - return 0; - pbody.auth_alg = EXTRACT_LE_U_2(p); + goto trunc; + pbody.auth_alg = GET_LE_U_2(p); offset += 2; length -= 2; - pbody.auth_trans_seq_num = EXTRACT_LE_U_2(p + offset); + pbody.auth_trans_seq_num = GET_LE_U_2(p + offset); offset += 2; length -= 2; - pbody.status_code = EXTRACT_LE_U_2(p + offset); + pbody.status_code = GET_LE_U_2(p + offset); offset += 2; length -= 2; @@ -1468,7 +1478,7 @@ handle_auth(netdissect_options *ndo, : "Reserved", pbody.auth_trans_seq_num, ((pbody.auth_trans_seq_num % 2) - ? ((pbody.status_code < NUM_STATUSES) + ? ((pbody.status_code < NUM_STATUSES) ? status_text[pbody.status_code] : "n/a") : "")); return ret; @@ -1479,28 +1489,29 @@ handle_auth(netdissect_options *ndo, : "Reserved", pbody.auth_trans_seq_num, (pbody.auth_trans_seq_num % 2) - ? ((pbody.status_code < NUM_STATUSES) + ? ((pbody.status_code < NUM_STATUSES) ? status_text[pbody.status_code] - : "n/a") - : ""); + : "n/a") + : ""); return ret; +trunc: + return 0; } static int handle_deauth(netdissect_options *ndo, - const uint8_t *src, const u_char *p, u_int length) + const uint8_t *src, const u_char *p, u_int length) { struct mgmt_body_t pbody; const char *reason = NULL; memset(&pbody, 0, sizeof(pbody)); - if (!ND_TTEST_LEN(p, IEEE802_11_REASON_LEN)) - return 0; + ND_TCHECK_LEN(p, IEEE802_11_REASON_LEN); if (length < IEEE802_11_REASON_LEN) - return 0; - pbody.reason_code = EXTRACT_LE_U_2(p); + goto trunc; + pbody.reason_code = GET_LE_U_2(p); reason = (pbody.reason_code < NUM_REASONS) ? reason_text[pbody.reason_code] @@ -1512,6 +1523,8 @@ handle_deauth(netdissect_options *ndo, ND_PRINT(" (%s): %s", etheraddr_string(ndo, src), reason); } return 1; +trunc: + return 0; } #define PRINT_HT_ACTION(v) (\ @@ -1566,36 +1579,37 @@ handle_deauth(netdissect_options *ndo, static int handle_action(netdissect_options *ndo, - const uint8_t *src, const u_char *p, u_int length) + const uint8_t *src, const u_char *p, u_int length) { - if (!ND_TTEST_2(p)) - return 0; + ND_TCHECK_2(p); if (length < 2) - return 0; + goto trunc; if (ndo->ndo_eflag) { ND_PRINT(": "); } else { ND_PRINT(" (%s): ", etheraddr_string(ndo, src)); } - switch (EXTRACT_U_1(p)) { - case 0: ND_PRINT("Spectrum Management Act#%u", EXTRACT_U_1(p + 1)); break; - case 1: ND_PRINT("QoS Act#%u", EXTRACT_U_1(p + 1)); break; - case 2: ND_PRINT("DLS Act#%u", EXTRACT_U_1(p + 1)); break; - case 3: ND_PRINT("BA "); PRINT_BA_ACTION(EXTRACT_U_1(p + 1)); break; - case 7: ND_PRINT("HT "); PRINT_HT_ACTION(EXTRACT_U_1(p + 1)); break; - case 13: ND_PRINT("MeshAction "); PRINT_MESH_ACTION(EXTRACT_U_1(p + 1)); break; + switch (GET_U_1(p)) { + case 0: ND_PRINT("Spectrum Management Act#%u", GET_U_1(p + 1)); break; + case 1: ND_PRINT("QoS Act#%u", GET_U_1(p + 1)); break; + case 2: ND_PRINT("DLS Act#%u", GET_U_1(p + 1)); break; + case 3: ND_PRINT("BA "); PRINT_BA_ACTION(GET_U_1(p + 1)); break; + case 7: ND_PRINT("HT "); PRINT_HT_ACTION(GET_U_1(p + 1)); break; + case 13: ND_PRINT("MeshAction "); PRINT_MESH_ACTION(GET_U_1(p + 1)); break; case 14: ND_PRINT("MultiohopAction "); - PRINT_MULTIHOP_ACTION(EXTRACT_U_1(p + 1)); break; + PRINT_MULTIHOP_ACTION(GET_U_1(p + 1)); break; case 15: ND_PRINT("SelfprotectAction "); - PRINT_SELFPROT_ACTION(EXTRACT_U_1(p + 1)); break; - case 127: ND_PRINT("Vendor Act#%u", EXTRACT_U_1(p + 1)); break; + PRINT_SELFPROT_ACTION(GET_U_1(p + 1)); break; + case 127: ND_PRINT("Vendor Act#%u", GET_U_1(p + 1)); break; default: - ND_PRINT("Reserved(%u) Act#%u", EXTRACT_U_1(p), EXTRACT_U_1(p + 1)); + ND_PRINT("Reserved(%u) Act#%u", GET_U_1(p), GET_U_1(p + 1)); break; } return 1; +trunc: + return 0; } @@ -1606,7 +1620,7 @@ handle_action(netdissect_options *ndo, static int mgmt_body_print(netdissect_options *ndo, - uint16_t fc, const uint8_t *src, const u_char *p, u_int length) + uint16_t fc, const uint8_t *src, const u_char *p, u_int length) { ND_PRINT("%s", tok2str(st_str, "Unhandled Management subtype(%x)", FC_SUBTYPE(fc))); @@ -1650,7 +1664,7 @@ mgmt_body_print(netdissect_options *ndo, static int ctrl_body_print(netdissect_options *ndo, - uint16_t fc, const u_char *p) + uint16_t fc, const u_char *p) { ND_PRINT("%s", tok2str(ctrl_str, "Unknown Ctrl Subtype", FC_SUBTYPE(fc))); switch (FC_SUBTYPE(fc)) { @@ -1658,65 +1672,59 @@ ctrl_body_print(netdissect_options *ndo, /* XXX - requires special handling */ break; case CTRL_BAR: - if (!ND_TTEST_LEN(p, CTRL_BAR_HDRLEN)) - return 0; + ND_TCHECK_LEN(p, CTRL_BAR_HDRLEN); if (!ndo->ndo_eflag) ND_PRINT(" RA:%s TA:%s CTL(%x) SEQ(%u) ", etheraddr_string(ndo, ((const struct ctrl_bar_hdr_t *)p)->ra), etheraddr_string(ndo, ((const struct ctrl_bar_hdr_t *)p)->ta), - EXTRACT_LE_U_2(((const struct ctrl_bar_hdr_t *)p)->ctl), - EXTRACT_LE_U_2(((const struct ctrl_bar_hdr_t *)p)->seq)); + GET_LE_U_2(((const struct ctrl_bar_hdr_t *)p)->ctl), + GET_LE_U_2(((const struct ctrl_bar_hdr_t *)p)->seq)); break; case CTRL_BA: - if (!ND_TTEST_LEN(p, CTRL_BA_HDRLEN)) - return 0; + ND_TCHECK_LEN(p, CTRL_BA_HDRLEN); if (!ndo->ndo_eflag) ND_PRINT(" RA:%s ", etheraddr_string(ndo, ((const struct ctrl_ba_hdr_t *)p)->ra)); break; case CTRL_PS_POLL: - if (!ND_TTEST_LEN(p, CTRL_PS_POLL_HDRLEN)) - return 0; + ND_TCHECK_LEN(p, CTRL_PS_POLL_HDRLEN); ND_PRINT(" AID(%x)", - EXTRACT_LE_U_2(((const struct ctrl_ps_poll_hdr_t *)p)->aid)); + GET_LE_U_2(((const struct ctrl_ps_poll_hdr_t *)p)->aid)); break; case CTRL_RTS: - if (!ND_TTEST_LEN(p, CTRL_RTS_HDRLEN)) - return 0; + ND_TCHECK_LEN(p, CTRL_RTS_HDRLEN); if (!ndo->ndo_eflag) ND_PRINT(" TA:%s ", etheraddr_string(ndo, ((const struct ctrl_rts_hdr_t *)p)->ta)); break; case CTRL_CTS: - if (!ND_TTEST_LEN(p, CTRL_CTS_HDRLEN)) - return 0; + ND_TCHECK_LEN(p, CTRL_CTS_HDRLEN); if (!ndo->ndo_eflag) ND_PRINT(" RA:%s ", etheraddr_string(ndo, ((const struct ctrl_cts_hdr_t *)p)->ra)); break; case CTRL_ACK: - if (!ND_TTEST_LEN(p, CTRL_ACK_HDRLEN)) - return 0; + ND_TCHECK_LEN(p, CTRL_ACK_HDRLEN); if (!ndo->ndo_eflag) ND_PRINT(" RA:%s ", etheraddr_string(ndo, ((const struct ctrl_ack_hdr_t *)p)->ra)); break; case CTRL_CF_END: - if (!ND_TTEST_LEN(p, CTRL_END_HDRLEN)) - return 0; + ND_TCHECK_LEN(p, CTRL_END_HDRLEN); if (!ndo->ndo_eflag) ND_PRINT(" RA:%s ", etheraddr_string(ndo, ((const struct ctrl_end_hdr_t *)p)->ra)); break; case CTRL_END_ACK: - if (!ND_TTEST_LEN(p, CTRL_END_ACK_HDRLEN)) - return 0; + ND_TCHECK_LEN(p, CTRL_END_ACK_HDRLEN); if (!ndo->ndo_eflag) ND_PRINT(" RA:%s ", etheraddr_string(ndo, ((const struct ctrl_end_ack_hdr_t *)p)->ra)); break; } return 1; +trunc: + return 0; } /* @@ -1734,7 +1742,7 @@ ctrl_body_print(netdissect_options *ndo, */ static void get_data_src_dst_mac(uint16_t fc, const u_char *p, const uint8_t **srcp, - const uint8_t **dstp) + const uint8_t **dstp) { #define ADDR1 (p + 4) #define ADDR2 (p + 10) @@ -1853,8 +1861,8 @@ ctrl_header_print(netdissect_options *ndo, uint16_t fc, const u_char *p) ND_PRINT(" RA:%s TA:%s CTL(%x) SEQ(%u) ", etheraddr_string(ndo, ((const struct ctrl_bar_hdr_t *)p)->ra), etheraddr_string(ndo, ((const struct ctrl_bar_hdr_t *)p)->ta), - EXTRACT_LE_U_2(((const struct ctrl_bar_hdr_t *)p)->ctl), - EXTRACT_LE_U_2(((const struct ctrl_bar_hdr_t *)p)->seq)); + GET_LE_U_2(((const struct ctrl_bar_hdr_t *)p)->ctl), + GET_LE_U_2(((const struct ctrl_bar_hdr_t *)p)->seq)); break; case CTRL_BA: ND_PRINT("RA:%s ", @@ -1896,7 +1904,7 @@ ctrl_header_print(netdissect_options *ndo, uint16_t fc, const u_char *p) static int extract_header_length(netdissect_options *ndo, - uint16_t fc) + uint16_t fc) { int len; @@ -1939,9 +1947,9 @@ extract_header_length(netdissect_options *ndo, } static int -extract_mesh_header_length(const u_char *p) +extract_mesh_header_length(netdissect_options *ndo, const u_char *p) { - return (EXTRACT_U_1(p) &~ 3) ? 0 : 6*(1 + (EXTRACT_U_1(p) & 3)); + return (GET_U_1(p) &~ 3) ? 0 : 6*(1 + (GET_U_1(p) & 3)); } /* @@ -1949,8 +1957,8 @@ extract_mesh_header_length(const u_char *p) */ static void ieee_802_11_hdr_print(netdissect_options *ndo, - uint16_t fc, const u_char *p, u_int hdrlen, - u_int meshdrlen) + uint16_t fc, const u_char *p, u_int hdrlen, + u_int meshdrlen) { if (ndo->ndo_vflag) { if (FC_MORE_DATA(fc)) @@ -1967,15 +1975,15 @@ ieee_802_11_hdr_print(netdissect_options *ndo, ND_PRINT("Protected "); if (FC_TYPE(fc) != T_CTRL || FC_SUBTYPE(fc) != CTRL_PS_POLL) ND_PRINT("%uus ", - EXTRACT_LE_U_2(((const struct mgmt_header_t *)p)->duration)); + GET_LE_U_2(((const struct mgmt_header_t *)p)->duration)); } if (meshdrlen != 0) { const struct meshcntl_t *mc = (const struct meshcntl_t *)(p + hdrlen - meshdrlen); - u_int ae = EXTRACT_U_1(mc->flags) & 3; + u_int ae = GET_U_1(mc->flags) & 3; ND_PRINT("MeshData (AE %u TTL %u seq %u", ae, - EXTRACT_U_1(mc->ttl), EXTRACT_LE_U_4(mc->seq)); + GET_U_1(mc->ttl), GET_LE_U_4(mc->seq)); if (ae > 0) ND_PRINT(" A4:%s", etheraddr_string(ndo, mc->addr4)); if (ae > 1) @@ -2002,8 +2010,8 @@ ieee_802_11_hdr_print(netdissect_options *ndo, static u_int ieee802_11_print(netdissect_options *ndo, - const u_char *p, u_int length, u_int orig_caplen, int pad, - u_int fcslen) + const u_char *p, u_int length, u_int orig_caplen, int pad, + u_int fcslen) { uint16_t fc; u_int caplen, hdrlen, meshdrlen; @@ -2030,7 +2038,7 @@ ieee802_11_print(netdissect_options *ndo, return orig_caplen; } - fc = EXTRACT_LE_U_2(p); + fc = GET_LE_U_2(p); hdrlen = extract_header_length(ndo, fc); if (hdrlen == 0) { /* Unknown frame type or control frame subtype; quit. */ @@ -2044,7 +2052,7 @@ ieee802_11_print(netdissect_options *ndo, nd_print_trunc(ndo); return hdrlen; } - meshdrlen = extract_mesh_header_length(p+hdrlen); + meshdrlen = extract_mesh_header_length(ndo, p + hdrlen); hdrlen += meshdrlen; } else meshdrlen = 0; @@ -2121,7 +2129,7 @@ ieee802_11_print(netdissect_options *ndo, */ u_int ieee802_11_if_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, const u_char *p) + const struct pcap_pkthdr *h, const u_char *p) { ndo->ndo_protocol = "802.11_if"; return ieee802_11_print(ndo, p, h->len, h->caplen, 0, 0); @@ -2227,14 +2235,14 @@ struct ieee80211_radiotap_header { * Tx/Rx data rate. If bit 0x80 is set then it represents an * an MCS index and not an IEEE rate. * - * IEEE80211_RADIOTAP_DBM_ANTSIGNAL int8_t decibels from - * one milliwatt (dBm) + * IEEE80211_RADIOTAP_DBM_ANTSIGNAL int8_t decibels from + * one milliwatt (dBm) * * RF signal power at the antenna, decibel difference from * one milliwatt. * - * IEEE80211_RADIOTAP_DBM_ANTNOISE int8_t decibels from - * one milliwatt (dBm) + * IEEE80211_RADIOTAP_DBM_ANTNOISE int8_t decibels from + * one milliwatt (dBm) * * RF noise power at the antenna, decibel difference from one * milliwatt. @@ -2268,8 +2276,8 @@ struct ieee80211_radiotap_header { * set at factory calibration. 0 is max power. Monotonically * nondecreasing with lower power levels. * - * IEEE80211_RADIOTAP_DBM_TX_POWER int8_t decibels from - * one milliwatt (dBm) + * IEEE80211_RADIOTAP_DBM_TX_POWER int8_t decibels from + * one milliwatt (dBm) * * Transmit power expressed as dBm (decibels from a 1 milliwatt * reference). This is the absolute power level measured at @@ -2289,10 +2297,10 @@ struct ieee80211_radiotap_header { * * Properties of received frames. See flags defined below. * - * IEEE80211_RADIOTAP_XCHANNEL uint32_t bitmap - * uint16_t MHz - * uint8_t channel number - * uint8_t .5 dBm + * IEEE80211_RADIOTAP_XCHANNEL uint32_t bitmap + * uint16_t MHz + * uint8_t channel number + * uint8_t .5 dBm * * Extended channel specification: flags (see below) followed by * frequency in MHz, the corresponding IEEE channel number, and @@ -2300,9 +2308,9 @@ struct ieee80211_radiotap_header { * units. This property supersedes IEEE80211_RADIOTAP_CHANNEL * and only one of the two should be present. * - * IEEE80211_RADIOTAP_MCS uint8_t known - * uint8_t flags - * uint8_t mcs + * IEEE80211_RADIOTAP_MCS uint8_t known + * uint8_t flags + * uint8_t mcs * * Bitset indicating which fields have known values, followed * by bitset of flag values, followed by the MCS rate index as @@ -2319,8 +2327,8 @@ struct ieee80211_radiotap_header { * * IEEE80211_RADIOTAP_VENDOR_NAMESPACE * uint8_t OUI[3] - * uint8_t subspace - * uint16_t length + * uint8_t subspace + * uint16_t length * * The Vendor Namespace Field contains three sub-fields. The first * sub-field is 3 bytes long. It contains the vendor's IEEE 802 @@ -2373,15 +2381,15 @@ enum ieee80211_radiotap_type { /* Useful combinations of channel characteristics, borrowed from Ethereal */ #define IEEE80211_CHAN_A \ - (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM) + (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM) #define IEEE80211_CHAN_B \ - (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_CCK) + (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_CCK) #define IEEE80211_CHAN_G \ - (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN) + (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN) #define IEEE80211_CHAN_TA \ - (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO) + (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO) #define IEEE80211_CHAN_TG \ - (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN | IEEE80211_CHAN_TURBO) + (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN | IEEE80211_CHAN_TURBO) /* For IEEE80211_RADIOTAP_FLAGS */ @@ -2496,7 +2504,7 @@ enum ieee80211_radiotap_type { static void print_chaninfo(netdissect_options *ndo, - uint16_t freq, int flags, int presentflags) + uint16_t freq, int flags, int presentflags) { ND_PRINT("%u MHz", freq); if (presentflags & (1 << IEEE80211_RADIOTAP_MCS)) { @@ -2542,8 +2550,8 @@ print_chaninfo(netdissect_options *ndo, static int print_radiotap_field(netdissect_options *ndo, - struct cpack_state *s, uint32_t bit, uint8_t *flagsp, - uint32_t presentflags) + struct cpack_state *s, uint32_t bit, uint8_t *flagsp, + uint32_t presentflags) { u_int i; int rc; @@ -2553,7 +2561,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_TSFT: { uint64_t tsft; - rc = cpack_uint64(s, &tsft); + rc = cpack_uint64(ndo, s, &tsft); if (rc != 0) goto trunc; ND_PRINT("%" PRIu64 "us tsft ", tsft); @@ -2563,7 +2571,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_FLAGS: { uint8_t flagsval; - rc = cpack_uint8(s, &flagsval); + rc = cpack_uint8(ndo, s, &flagsval); if (rc != 0) goto trunc; *flagsp = flagsval; @@ -2583,7 +2591,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_RATE: { uint8_t rate; - rc = cpack_uint8(s, &rate); + rc = cpack_uint8(ndo, s, &rate); if (rc != 0) goto trunc; /* @@ -2634,10 +2642,10 @@ print_radiotap_field(netdissect_options *ndo, uint16_t frequency; uint16_t flags; - rc = cpack_uint16(s, &frequency); + rc = cpack_uint16(ndo, s, &frequency); if (rc != 0) goto trunc; - rc = cpack_uint16(s, &flags); + rc = cpack_uint16(ndo, s, &flags); if (rc != 0) goto trunc; /* @@ -2654,10 +2662,10 @@ print_radiotap_field(netdissect_options *ndo, uint8_t hopset; uint8_t hoppat; - rc = cpack_uint8(s, &hopset); + rc = cpack_uint8(ndo, s, &hopset); if (rc != 0) goto trunc; - rc = cpack_uint8(s, &hoppat); + rc = cpack_uint8(ndo, s, &hoppat); if (rc != 0) goto trunc; ND_PRINT("fhset %u fhpat %u ", hopset, hoppat); @@ -2667,7 +2675,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_DBM_ANTSIGNAL: { int8_t dbm_antsignal; - rc = cpack_int8(s, &dbm_antsignal); + rc = cpack_int8(ndo, s, &dbm_antsignal); if (rc != 0) goto trunc; ND_PRINT("%ddBm signal ", dbm_antsignal); @@ -2677,7 +2685,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_DBM_ANTNOISE: { int8_t dbm_antnoise; - rc = cpack_int8(s, &dbm_antnoise); + rc = cpack_int8(ndo, s, &dbm_antnoise); if (rc != 0) goto trunc; ND_PRINT("%ddBm noise ", dbm_antnoise); @@ -2687,7 +2695,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_LOCK_QUALITY: { uint16_t lock_quality; - rc = cpack_uint16(s, &lock_quality); + rc = cpack_uint16(ndo, s, &lock_quality); if (rc != 0) goto trunc; ND_PRINT("%u sq ", lock_quality); @@ -2697,7 +2705,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_TX_ATTENUATION: { int16_t tx_attenuation; - rc = cpack_int16(s, &tx_attenuation); + rc = cpack_int16(ndo, s, &tx_attenuation); if (rc != 0) goto trunc; ND_PRINT("%d tx power ", -tx_attenuation); @@ -2707,7 +2715,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_DB_TX_ATTENUATION: { int8_t db_tx_attenuation; - rc = cpack_int8(s, &db_tx_attenuation); + rc = cpack_int8(ndo, s, &db_tx_attenuation); if (rc != 0) goto trunc; ND_PRINT("%ddB tx attenuation ", -db_tx_attenuation); @@ -2717,7 +2725,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_DBM_TX_POWER: { int8_t dbm_tx_power; - rc = cpack_int8(s, &dbm_tx_power); + rc = cpack_int8(ndo, s, &dbm_tx_power); if (rc != 0) goto trunc; ND_PRINT("%ddBm tx power ", dbm_tx_power); @@ -2727,7 +2735,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_ANTENNA: { uint8_t antenna; - rc = cpack_uint8(s, &antenna); + rc = cpack_uint8(ndo, s, &antenna); if (rc != 0) goto trunc; ND_PRINT("antenna %u ", antenna); @@ -2737,7 +2745,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_DB_ANTSIGNAL: { uint8_t db_antsignal; - rc = cpack_uint8(s, &db_antsignal); + rc = cpack_uint8(ndo, s, &db_antsignal); if (rc != 0) goto trunc; ND_PRINT("%udB signal ", db_antsignal); @@ -2747,7 +2755,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_DB_ANTNOISE: { uint8_t db_antnoise; - rc = cpack_uint8(s, &db_antnoise); + rc = cpack_uint8(ndo, s, &db_antnoise); if (rc != 0) goto trunc; ND_PRINT("%udB noise ", db_antnoise); @@ -2757,7 +2765,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_RX_FLAGS: { uint16_t rx_flags; - rc = cpack_uint16(s, &rx_flags); + rc = cpack_uint16(ndo, s, &rx_flags); if (rc != 0) goto trunc; /* Do nothing for now */ @@ -2770,16 +2778,16 @@ print_radiotap_field(netdissect_options *ndo, uint8_t channel; uint8_t maxpower; - rc = cpack_uint32(s, &flags); + rc = cpack_uint32(ndo, s, &flags); if (rc != 0) goto trunc; - rc = cpack_uint16(s, &frequency); + rc = cpack_uint16(ndo, s, &frequency); if (rc != 0) goto trunc; - rc = cpack_uint8(s, &channel); + rc = cpack_uint8(ndo, s, &channel); if (rc != 0) goto trunc; - rc = cpack_uint8(s, &maxpower); + rc = cpack_uint8(ndo, s, &maxpower); if (rc != 0) goto trunc; print_chaninfo(ndo, frequency, flags, presentflags); @@ -2798,13 +2806,13 @@ print_radiotap_field(netdissect_options *ndo, }; float htrate; - rc = cpack_uint8(s, &known); + rc = cpack_uint8(ndo, s, &known); if (rc != 0) goto trunc; - rc = cpack_uint8(s, &flags); + rc = cpack_uint8(ndo, s, &flags); if (rc != 0) goto trunc; - rc = cpack_uint8(s, &mcs_index); + rc = cpack_uint8(ndo, s, &mcs_index); if (rc != 0) goto trunc; if (known & IEEE80211_RADIOTAP_MCS_MCS_INDEX_KNOWN) { @@ -2886,16 +2894,16 @@ print_radiotap_field(netdissect_options *ndo, uint8_t delim_crc; uint8_t reserved; - rc = cpack_uint32(s, &reference_num); + rc = cpack_uint32(ndo, s, &reference_num); if (rc != 0) goto trunc; - rc = cpack_uint16(s, &flags); + rc = cpack_uint16(ndo, s, &flags); if (rc != 0) goto trunc; - rc = cpack_uint8(s, &delim_crc); + rc = cpack_uint8(ndo, s, &delim_crc); if (rc != 0) goto trunc; - rc = cpack_uint8(s, &reserved); + rc = cpack_uint8(ndo, s, &reserved); if (rc != 0) goto trunc; /* Do nothing for now */ @@ -2945,27 +2953,27 @@ print_radiotap_field(netdissect_options *ndo, "unknown (31)" }; - rc = cpack_uint16(s, &known); + rc = cpack_uint16(ndo, s, &known); if (rc != 0) goto trunc; - rc = cpack_uint8(s, &flags); + rc = cpack_uint8(ndo, s, &flags); if (rc != 0) goto trunc; - rc = cpack_uint8(s, &bandwidth); + rc = cpack_uint8(ndo, s, &bandwidth); if (rc != 0) goto trunc; for (i = 0; i < 4; i++) { - rc = cpack_uint8(s, &mcs_nss[i]); + rc = cpack_uint8(ndo, s, &mcs_nss[i]); if (rc != 0) goto trunc; } - rc = cpack_uint8(s, &coding); + rc = cpack_uint8(ndo, s, &coding); if (rc != 0) goto trunc; - rc = cpack_uint8(s, &group_id); + rc = cpack_uint8(ndo, s, &group_id); if (rc != 0) goto trunc; - rc = cpack_uint16(s, &partial_aid); + rc = cpack_uint16(ndo, s, &partial_aid); if (rc != 0) goto trunc; for (i = 0; i < 4; i++) { @@ -3012,8 +3020,8 @@ trunc: static int print_in_radiotap_namespace(netdissect_options *ndo, - struct cpack_state *s, uint8_t *flags, - uint32_t presentflags, int bit0) + struct cpack_state *s, uint8_t *flags, + uint32_t presentflags, int bit0) { #define BITNO_32(x) (((x) >> 16) ? 16 + BITNO_16((x) >> 16) : BITNO_16((x))) #define BITNO_16(x) (((x) >> 8) ? 8 + BITNO_8((x) >> 8) : BITNO_8((x))) @@ -3060,11 +3068,11 @@ print_in_radiotap_namespace(netdissect_options *ndo, u_int ieee802_11_radio_print(netdissect_options *ndo, - const u_char *p, u_int length, u_int caplen) + const u_char *p, u_int length, u_int caplen) { #define BIT(n) (1U << n) #define IS_EXTENDED(__p) \ - (EXTRACT_LE_U_4(__p) & BIT(IEEE80211_RADIOTAP_EXT)) != 0 + (GET_LE_U_4(__p) & BIT(IEEE80211_RADIOTAP_EXT)) != 0 struct cpack_state cpacker; const struct ieee80211_radiotap_header *hdr; @@ -3088,7 +3096,7 @@ ieee802_11_radio_print(netdissect_options *ndo, hdr = (const struct ieee80211_radiotap_header *)p; - len = EXTRACT_LE_U_2(hdr->it_len); + len = GET_LE_U_2(hdr->it_len); if (len < sizeof(*hdr)) { /* * The length is the length of the entire header, so @@ -3136,7 +3144,7 @@ ieee802_11_radio_print(netdissect_options *ndo, fcslen = 0; for (presentp = &hdr->it_present; presentp <= last_presentp; presentp++) { - presentflags = EXTRACT_LE_U_4(presentp); + presentflags = GET_LE_U_4(presentp); /* * If this is a vendor namespace, we don't handle it. @@ -3215,23 +3223,23 @@ ieee802_11_radio_print(netdissect_options *ndo, nd_print_trunc(ndo); break; } - if (cpack_uint8(&cpacker, &vendor_oui[0]) != 0) { + if (cpack_uint8(ndo, &cpacker, &vendor_oui[0]) != 0) { nd_print_trunc(ndo); break; } - if (cpack_uint8(&cpacker, &vendor_oui[1]) != 0) { + if (cpack_uint8(ndo, &cpacker, &vendor_oui[1]) != 0) { nd_print_trunc(ndo); break; } - if (cpack_uint8(&cpacker, &vendor_oui[2]) != 0) { + if (cpack_uint8(ndo, &cpacker, &vendor_oui[2]) != 0) { nd_print_trunc(ndo); break; } - if (cpack_uint8(&cpacker, &vendor_subnamespace) != 0) { + if (cpack_uint8(ndo, &cpacker, &vendor_subnamespace) != 0) { nd_print_trunc(ndo); break; } - if (cpack_uint16(&cpacker, &skip_length) != 0) { + if (cpack_uint16(ndo, &cpacker, &skip_length) != 0) { nd_print_trunc(ndo); break; } @@ -3263,7 +3271,7 @@ ieee802_11_radio_print(netdissect_options *ndo, static u_int ieee802_11_radio_avs_print(netdissect_options *ndo, - const u_char *p, u_int length, u_int caplen) + const u_char *p, u_int length, u_int caplen) { uint32_t caphdr_len; @@ -3273,7 +3281,7 @@ ieee802_11_radio_avs_print(netdissect_options *ndo, return caplen; } - caphdr_len = EXTRACT_BE_U_4(p + 4); + caphdr_len = GET_BE_U_4(p + 4); if (caphdr_len < 8) { /* * Yow! The capture header length is claimed not @@ -3314,7 +3322,7 @@ ieee802_11_radio_avs_print(netdissect_options *ndo, */ u_int prism_if_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, const u_char *p) + const struct pcap_pkthdr *h, const u_char *p) { u_int caplen = h->caplen; u_int length = h->len; @@ -3326,7 +3334,7 @@ prism_if_print(netdissect_options *ndo, return caplen; } - msgcode = EXTRACT_BE_U_4(p); + msgcode = GET_BE_U_4(p); if (msgcode == WLANCAP_MAGIC_COOKIE_V1 || msgcode == WLANCAP_MAGIC_COOKIE_V2) return ieee802_11_radio_avs_print(ndo, p, length, caplen); @@ -3346,7 +3354,7 @@ prism_if_print(netdissect_options *ndo, */ u_int ieee802_11_radio_if_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, const u_char *p) + const struct pcap_pkthdr *h, const u_char *p) { ndo->ndo_protocol = "802.11_radio_if"; return ieee802_11_radio_print(ndo, p, h->len, h->caplen); @@ -3359,7 +3367,7 @@ ieee802_11_radio_if_print(netdissect_options *ndo, */ u_int ieee802_11_radio_avs_if_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, const u_char *p) + const struct pcap_pkthdr *h, const u_char *p) { ndo->ndo_protocol = "802.11_radio_avs_if"; return ieee802_11_radio_avs_print(ndo, p, h->len, h->caplen);