X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/815e033571066730908dc91e0486ee136540db5e..d2777156522f139a858bd6b5b51e364826bc95a7:/print-802_11.c diff --git a/print-802_11.c b/print-802_11.c index 7fcf3994..dc8953a9 100644 --- a/print-802_11.c +++ b/print-802_11.c @@ -1284,9 +1284,18 @@ parse_elements(netdissect_options *ndo, length -= cf.length; break; } - memcpy(&cf.count, p + offset, 6); - offset += 6; - length -= 6; + cf.count = GET_U_1(p + offset); + offset += 1; + length -= 1; + cf.period = GET_U_1(p + offset); + offset += 1; + length -= 1; + cf.max_duration = GET_LE_U_2(p + offset); + offset += 2; + length -= 2; + cf.dur_remaining = GET_LE_U_2(p + offset); + offset += 2; + length -= 2; /* * Present and not truncated. * @@ -1310,10 +1319,15 @@ parse_elements(netdissect_options *ndo, } if (tim.length - 3U > sizeof(tim.bitmap)) return 0; - memcpy(&tim.count, p + offset, 3); - offset += 3; - length -= 3; - + tim.count = GET_U_1(p + offset); + offset += 1; + length -= 1; + tim.period = GET_U_1(p + offset); + offset += 1; + length -= 1; + tim.bitmap_control = GET_U_1(p + offset); + offset += 1; + length -= 1; memcpy(tim.bitmap, p + offset, tim.length - 3); offset += tim.length - 3; length -= tim.length - 3; @@ -1899,7 +1913,7 @@ get_data_src_dst_mac(uint16_t fc, const u_char *p, const uint8_t **srcp, } } else { if (!FC_FROM_DS(fc)) { - /* From DS and not To DS */ + /* To DS and not From DS */ *srcp = ADDR2; *dstp = ADDR3; } else { @@ -2265,12 +2279,12 @@ ieee802_11_print(netdissect_options *ndo, * 'h->len' is the length of the packet off the wire, and 'h->caplen' * is the number of bytes actually captured. */ -u_int +void ieee802_11_if_print(netdissect_options *ndo, 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); + ndo->ndo_protocol = "802.11"; + ndo->ndo_ll_hdr_len += ieee802_11_print(ndo, p, h->len, h->caplen, 0, 0); } @@ -2642,7 +2656,7 @@ enum ieee80211_radiotap_type { static void print_chaninfo(netdissect_options *ndo, - uint16_t freq, int flags, int presentflags) + uint16_t freq, uint32_t flags, uint32_t presentflags) { ND_PRINT("%u MHz", freq); if (presentflags & (1 << IEEE80211_RADIOTAP_MCS)) { @@ -2699,7 +2713,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_TSFT: { uint64_t tsft; - rc = cpack_uint64(ndo, s, &tsft); + rc = nd_cpack_uint64(ndo, s, &tsft); if (rc != 0) goto trunc; ND_PRINT("%" PRIu64 "us tsft ", tsft); @@ -2709,7 +2723,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_FLAGS: { uint8_t flagsval; - rc = cpack_uint8(ndo, s, &flagsval); + rc = nd_cpack_uint8(ndo, s, &flagsval); if (rc != 0) goto trunc; *flagsp = flagsval; @@ -2729,7 +2743,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_RATE: { uint8_t rate; - rc = cpack_uint8(ndo, s, &rate); + rc = nd_cpack_uint8(ndo, s, &rate); if (rc != 0) goto trunc; /* @@ -2780,10 +2794,10 @@ print_radiotap_field(netdissect_options *ndo, uint16_t frequency; uint16_t flags; - rc = cpack_uint16(ndo, s, &frequency); + rc = nd_cpack_uint16(ndo, s, &frequency); if (rc != 0) goto trunc; - rc = cpack_uint16(ndo, s, &flags); + rc = nd_cpack_uint16(ndo, s, &flags); if (rc != 0) goto trunc; /* @@ -2800,10 +2814,10 @@ print_radiotap_field(netdissect_options *ndo, uint8_t hopset; uint8_t hoppat; - rc = cpack_uint8(ndo, s, &hopset); + rc = nd_cpack_uint8(ndo, s, &hopset); if (rc != 0) goto trunc; - rc = cpack_uint8(ndo, s, &hoppat); + rc = nd_cpack_uint8(ndo, s, &hoppat); if (rc != 0) goto trunc; ND_PRINT("fhset %u fhpat %u ", hopset, hoppat); @@ -2813,7 +2827,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_DBM_ANTSIGNAL: { int8_t dbm_antsignal; - rc = cpack_int8(ndo, s, &dbm_antsignal); + rc = nd_cpack_int8(ndo, s, &dbm_antsignal); if (rc != 0) goto trunc; ND_PRINT("%ddBm signal ", dbm_antsignal); @@ -2823,7 +2837,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_DBM_ANTNOISE: { int8_t dbm_antnoise; - rc = cpack_int8(ndo, s, &dbm_antnoise); + rc = nd_cpack_int8(ndo, s, &dbm_antnoise); if (rc != 0) goto trunc; ND_PRINT("%ddBm noise ", dbm_antnoise); @@ -2833,7 +2847,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_LOCK_QUALITY: { uint16_t lock_quality; - rc = cpack_uint16(ndo, s, &lock_quality); + rc = nd_cpack_uint16(ndo, s, &lock_quality); if (rc != 0) goto trunc; ND_PRINT("%u sq ", lock_quality); @@ -2843,7 +2857,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_TX_ATTENUATION: { int16_t tx_attenuation; - rc = cpack_int16(ndo, s, &tx_attenuation); + rc = nd_cpack_int16(ndo, s, &tx_attenuation); if (rc != 0) goto trunc; ND_PRINT("%d tx power ", -tx_attenuation); @@ -2853,7 +2867,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_DB_TX_ATTENUATION: { int8_t db_tx_attenuation; - rc = cpack_int8(ndo, s, &db_tx_attenuation); + rc = nd_cpack_int8(ndo, s, &db_tx_attenuation); if (rc != 0) goto trunc; ND_PRINT("%ddB tx attenuation ", -db_tx_attenuation); @@ -2863,7 +2877,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_DBM_TX_POWER: { int8_t dbm_tx_power; - rc = cpack_int8(ndo, s, &dbm_tx_power); + rc = nd_cpack_int8(ndo, s, &dbm_tx_power); if (rc != 0) goto trunc; ND_PRINT("%ddBm tx power ", dbm_tx_power); @@ -2873,7 +2887,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_ANTENNA: { uint8_t antenna; - rc = cpack_uint8(ndo, s, &antenna); + rc = nd_cpack_uint8(ndo, s, &antenna); if (rc != 0) goto trunc; ND_PRINT("antenna %u ", antenna); @@ -2883,7 +2897,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_DB_ANTSIGNAL: { uint8_t db_antsignal; - rc = cpack_uint8(ndo, s, &db_antsignal); + rc = nd_cpack_uint8(ndo, s, &db_antsignal); if (rc != 0) goto trunc; ND_PRINT("%udB signal ", db_antsignal); @@ -2893,7 +2907,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_DB_ANTNOISE: { uint8_t db_antnoise; - rc = cpack_uint8(ndo, s, &db_antnoise); + rc = nd_cpack_uint8(ndo, s, &db_antnoise); if (rc != 0) goto trunc; ND_PRINT("%udB noise ", db_antnoise); @@ -2903,7 +2917,7 @@ print_radiotap_field(netdissect_options *ndo, case IEEE80211_RADIOTAP_RX_FLAGS: { uint16_t rx_flags; - rc = cpack_uint16(ndo, s, &rx_flags); + rc = nd_cpack_uint16(ndo, s, &rx_flags); if (rc != 0) goto trunc; /* Do nothing for now */ @@ -2916,16 +2930,16 @@ print_radiotap_field(netdissect_options *ndo, uint8_t channel; uint8_t maxpower; - rc = cpack_uint32(ndo, s, &flags); + rc = nd_cpack_uint32(ndo, s, &flags); if (rc != 0) goto trunc; - rc = cpack_uint16(ndo, s, &frequency); + rc = nd_cpack_uint16(ndo, s, &frequency); if (rc != 0) goto trunc; - rc = cpack_uint8(ndo, s, &channel); + rc = nd_cpack_uint8(ndo, s, &channel); if (rc != 0) goto trunc; - rc = cpack_uint8(ndo, s, &maxpower); + rc = nd_cpack_uint8(ndo, s, &maxpower); if (rc != 0) goto trunc; print_chaninfo(ndo, frequency, flags, presentflags); @@ -2944,13 +2958,13 @@ print_radiotap_field(netdissect_options *ndo, }; float htrate; - rc = cpack_uint8(ndo, s, &known); + rc = nd_cpack_uint8(ndo, s, &known); if (rc != 0) goto trunc; - rc = cpack_uint8(ndo, s, &flags); + rc = nd_cpack_uint8(ndo, s, &flags); if (rc != 0) goto trunc; - rc = cpack_uint8(ndo, s, &mcs_index); + rc = nd_cpack_uint8(ndo, s, &mcs_index); if (rc != 0) goto trunc; if (known & IEEE80211_RADIOTAP_MCS_MCS_INDEX_KNOWN) { @@ -3032,16 +3046,16 @@ print_radiotap_field(netdissect_options *ndo, uint8_t delim_crc; uint8_t reserved; - rc = cpack_uint32(ndo, s, &reference_num); + rc = nd_cpack_uint32(ndo, s, &reference_num); if (rc != 0) goto trunc; - rc = cpack_uint16(ndo, s, &flags); + rc = nd_cpack_uint16(ndo, s, &flags); if (rc != 0) goto trunc; - rc = cpack_uint8(ndo, s, &delim_crc); + rc = nd_cpack_uint8(ndo, s, &delim_crc); if (rc != 0) goto trunc; - rc = cpack_uint8(ndo, s, &reserved); + rc = nd_cpack_uint8(ndo, s, &reserved); if (rc != 0) goto trunc; /* Do nothing for now */ @@ -3091,27 +3105,27 @@ print_radiotap_field(netdissect_options *ndo, "unknown (31)" }; - rc = cpack_uint16(ndo, s, &known); + rc = nd_cpack_uint16(ndo, s, &known); if (rc != 0) goto trunc; - rc = cpack_uint8(ndo, s, &flags); + rc = nd_cpack_uint8(ndo, s, &flags); if (rc != 0) goto trunc; - rc = cpack_uint8(ndo, s, &bandwidth); + rc = nd_cpack_uint8(ndo, s, &bandwidth); if (rc != 0) goto trunc; for (i = 0; i < 4; i++) { - rc = cpack_uint8(ndo, s, &mcs_nss[i]); + rc = nd_cpack_uint8(ndo, s, &mcs_nss[i]); if (rc != 0) goto trunc; } - rc = cpack_uint8(ndo, s, &coding); + rc = nd_cpack_uint8(ndo, s, &coding); if (rc != 0) goto trunc; - rc = cpack_uint8(ndo, s, &group_id); + rc = nd_cpack_uint8(ndo, s, &group_id); if (rc != 0) goto trunc; - rc = cpack_uint16(ndo, s, &partial_aid); + rc = nd_cpack_uint16(ndo, s, &partial_aid); if (rc != 0) goto trunc; for (i = 0; i < 4; i++) { @@ -3252,13 +3266,13 @@ ieee802_11_radio_print(netdissect_options *ndo, nd_print_trunc(ndo); return caplen; } - cpack_init(&cpacker, (const uint8_t *)hdr, len); /* align against header start */ - cpack_advance(&cpacker, sizeof(*hdr)); /* includes the 1st bitmap */ + nd_cpack_init(&cpacker, (const uint8_t *)hdr, len); /* align against header start */ + nd_cpack_advance(&cpacker, sizeof(*hdr)); /* includes the 1st bitmap */ for (last_presentp = &hdr->it_present; (const u_char*)(last_presentp + 1) <= p + len && IS_EXTENDED(last_presentp); last_presentp++) - cpack_advance(&cpacker, sizeof(hdr->it_present)); /* more bitmaps */ + nd_cpack_advance(&cpacker, sizeof(hdr->it_present)); /* more bitmaps */ /* are there more bitmap extensions than bytes in header? */ if ((const u_char*)(last_presentp + 1) > p + len) { @@ -3294,7 +3308,7 @@ ieee802_11_radio_print(netdissect_options *ndo, * it'd be added here; use vendor_oui and * vendor_subnamespace to interpret the fields. */ - if (cpack_advance(&cpacker, skip_length) != 0) { + if (nd_cpack_advance(&cpacker, skip_length) != 0) { /* * Ran out of space in the packet. */ @@ -3357,27 +3371,27 @@ ieee802_11_radio_print(netdissect_options *ndo, */ bit0 = 0; vendor_namespace = 1; - if ((cpack_align_and_reserve(&cpacker, 2)) == NULL) { + if ((nd_cpack_align_and_reserve(&cpacker, 2)) == NULL) { nd_print_trunc(ndo); break; } - if (cpack_uint8(ndo, &cpacker, &vendor_oui[0]) != 0) { + if (nd_cpack_uint8(ndo, &cpacker, &vendor_oui[0]) != 0) { nd_print_trunc(ndo); break; } - if (cpack_uint8(ndo, &cpacker, &vendor_oui[1]) != 0) { + if (nd_cpack_uint8(ndo, &cpacker, &vendor_oui[1]) != 0) { nd_print_trunc(ndo); break; } - if (cpack_uint8(ndo, &cpacker, &vendor_oui[2]) != 0) { + if (nd_cpack_uint8(ndo, &cpacker, &vendor_oui[2]) != 0) { nd_print_trunc(ndo); break; } - if (cpack_uint8(ndo, &cpacker, &vendor_subnamespace) != 0) { + if (nd_cpack_uint8(ndo, &cpacker, &vendor_subnamespace) != 0) { nd_print_trunc(ndo); break; } - if (cpack_uint16(ndo, &cpacker, &skip_length) != 0) { + if (nd_cpack_uint16(ndo, &cpacker, &skip_length) != 0) { nd_print_trunc(ndo); break; } @@ -3458,7 +3472,7 @@ ieee802_11_radio_avs_print(netdissect_options *ndo, * the AVS header, and the first 4 bytes of the header are used to * indicate whether it's a Prism header or an AVS header). */ -u_int +void prism_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { @@ -3466,36 +3480,43 @@ prism_if_print(netdissect_options *ndo, u_int length = h->len; uint32_t msgcode; - ndo->ndo_protocol = "prism_if"; + ndo->ndo_protocol = "prism"; if (caplen < 4) { nd_print_trunc(ndo); - return caplen; + ndo->ndo_ll_hdr_len += caplen; + return; } 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); + msgcode == WLANCAP_MAGIC_COOKIE_V2) { + ndo->ndo_ll_hdr_len += ieee802_11_radio_avs_print(ndo, p, length, caplen); + return; + } if (caplen < PRISM_HDR_LEN) { nd_print_trunc(ndo); - return caplen; + ndo->ndo_ll_hdr_len += caplen; + return; } - return PRISM_HDR_LEN + ieee802_11_print(ndo, p + PRISM_HDR_LEN, - length - PRISM_HDR_LEN, caplen - PRISM_HDR_LEN, 0, 0); + p += PRISM_HDR_LEN; + length -= PRISM_HDR_LEN; + caplen -= PRISM_HDR_LEN; + ndo->ndo_ll_hdr_len += PRISM_HDR_LEN; + ndo->ndo_ll_hdr_len += ieee802_11_print(ndo, p, length, caplen, 0, 0); } /* * For DLT_IEEE802_11_RADIO; like DLT_IEEE802_11, but with an extra * header, containing information such as radio information. */ -u_int +void ieee802_11_radio_if_print(netdissect_options *ndo, 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); + ndo->ndo_protocol = "802.11_radio"; + ndo->ndo_ll_hdr_len += ieee802_11_radio_print(ndo, p, h->len, h->caplen); } /* @@ -3503,10 +3524,10 @@ ieee802_11_radio_if_print(netdissect_options *ndo, * extra header, containing information such as radio information, * which we currently ignore. */ -u_int +void ieee802_11_radio_avs_if_print(netdissect_options *ndo, 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); + ndo->ndo_protocol = "802.11_radio_avs"; + ndo->ndo_ll_hdr_len += ieee802_11_radio_avs_print(ndo, p, h->len, h->caplen); }