X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/3bc62cd35f4c52f590605c73d92c92b6b4a4bdc5..cc2d4cbd8ca150504127f375d8b51b194958d95b:/print-802_11.c diff --git a/print-802_11.c b/print-802_11.c index 8722f854..73b79764 100644 --- a/print-802_11.c +++ b/print-802_11.c @@ -23,10 +23,10 @@ /* \summary: IEEE 802.11 printer */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include +#include "netdissect-stdinc.h" #include @@ -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; }; @@ -231,7 +231,7 @@ struct cf_t { uint8_t count; uint8_t period; uint16_t max_duration; - uint16_t dur_remaing; + uint16_t dur_remaining; }; struct tim_t { @@ -243,38 +243,38 @@ struct tim_t { uint8_t bitmap[251]; }; -#define E_SSID 0 -#define E_RATES 1 -#define E_FH 2 -#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_SSID 0 +#define E_RATES 1 +#define E_FH 2 +#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 */ 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; @@ -402,7 +402,7 @@ struct meshcntl_t { #define PRINT_SSID(p) \ if (p.ssid_present) { \ ND_PRINT(" ("); \ - fn_print(ndo, p.ssid.ssid, NULL); \ + fn_print_str(ndo, p.ssid.ssid); \ ND_PRINT(")"); \ } @@ -440,393 +440,393 @@ struct meshcntl_t { */ static const float ieee80211_float_htrates[MAX_MCS_INDEX+1][2][2] = { /* MCS 0 */ - { /* 20 Mhz */ { 6.5, /* SGI */ 7.2, }, - /* 40 Mhz */ { 13.5, /* SGI */ 15.0, }, + { /* 20 Mhz */ { 6.5f, /* SGI */ 7.2f, }, + /* 40 Mhz */ { 13.5f, /* SGI */ 15.0f, }, }, /* MCS 1 */ - { /* 20 Mhz */ { 13.0, /* SGI */ 14.4, }, - /* 40 Mhz */ { 27.0, /* SGI */ 30.0, }, + { /* 20 Mhz */ { 13.0f, /* SGI */ 14.4f, }, + /* 40 Mhz */ { 27.0f, /* SGI */ 30.0f, }, }, /* MCS 2 */ - { /* 20 Mhz */ { 19.5, /* SGI */ 21.7, }, - /* 40 Mhz */ { 40.5, /* SGI */ 45.0, }, + { /* 20 Mhz */ { 19.5f, /* SGI */ 21.7f, }, + /* 40 Mhz */ { 40.5f, /* SGI */ 45.0f, }, }, /* MCS 3 */ - { /* 20 Mhz */ { 26.0, /* SGI */ 28.9, }, - /* 40 Mhz */ { 54.0, /* SGI */ 60.0, }, + { /* 20 Mhz */ { 26.0f, /* SGI */ 28.9f, }, + /* 40 Mhz */ { 54.0f, /* SGI */ 60.0f, }, }, /* MCS 4 */ - { /* 20 Mhz */ { 39.0, /* SGI */ 43.3, }, - /* 40 Mhz */ { 81.0, /* SGI */ 90.0, }, + { /* 20 Mhz */ { 39.0f, /* SGI */ 43.3f, }, + /* 40 Mhz */ { 81.0f, /* SGI */ 90.0f, }, }, /* MCS 5 */ - { /* 20 Mhz */ { 52.0, /* SGI */ 57.8, }, - /* 40 Mhz */ { 108.0, /* SGI */ 120.0, }, + { /* 20 Mhz */ { 52.0f, /* SGI */ 57.8f, }, + /* 40 Mhz */ { 108.0f, /* SGI */ 120.0f, }, }, /* MCS 6 */ - { /* 20 Mhz */ { 58.5, /* SGI */ 65.0, }, - /* 40 Mhz */ { 121.5, /* SGI */ 135.0, }, + { /* 20 Mhz */ { 58.5f, /* SGI */ 65.0f, }, + /* 40 Mhz */ { 121.5f, /* SGI */ 135.0f, }, }, /* MCS 7 */ - { /* 20 Mhz */ { 65.0, /* SGI */ 72.2, }, - /* 40 Mhz */ { 135.0, /* SGI */ 150.0, }, + { /* 20 Mhz */ { 65.0f, /* SGI */ 72.2f, }, + /* 40 Mhz */ { 135.0f, /* SGI */ 150.0f, }, }, /* MCS 8 */ - { /* 20 Mhz */ { 13.0, /* SGI */ 14.4, }, - /* 40 Mhz */ { 27.0, /* SGI */ 30.0, }, + { /* 20 Mhz */ { 13.0f, /* SGI */ 14.4f, }, + /* 40 Mhz */ { 27.0f, /* SGI */ 30.0f, }, }, /* MCS 9 */ - { /* 20 Mhz */ { 26.0, /* SGI */ 28.9, }, - /* 40 Mhz */ { 54.0, /* SGI */ 60.0, }, + { /* 20 Mhz */ { 26.0f, /* SGI */ 28.9f, }, + /* 40 Mhz */ { 54.0f, /* SGI */ 60.0f, }, }, /* MCS 10 */ - { /* 20 Mhz */ { 39.0, /* SGI */ 43.3, }, - /* 40 Mhz */ { 81.0, /* SGI */ 90.0, }, + { /* 20 Mhz */ { 39.0f, /* SGI */ 43.3f, }, + /* 40 Mhz */ { 81.0f, /* SGI */ 90.0f, }, }, /* MCS 11 */ - { /* 20 Mhz */ { 52.0, /* SGI */ 57.8, }, - /* 40 Mhz */ { 108.0, /* SGI */ 120.0, }, + { /* 20 Mhz */ { 52.0f, /* SGI */ 57.8f, }, + /* 40 Mhz */ { 108.0f, /* SGI */ 120.0f, }, }, /* MCS 12 */ - { /* 20 Mhz */ { 78.0, /* SGI */ 86.7, }, - /* 40 Mhz */ { 162.0, /* SGI */ 180.0, }, + { /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, }, + /* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, }, }, /* MCS 13 */ - { /* 20 Mhz */ { 104.0, /* SGI */ 115.6, }, - /* 40 Mhz */ { 216.0, /* SGI */ 240.0, }, + { /* 20 Mhz */ { 104.0f, /* SGI */ 115.6f, }, + /* 40 Mhz */ { 216.0f, /* SGI */ 240.0f, }, }, /* MCS 14 */ - { /* 20 Mhz */ { 117.0, /* SGI */ 130.0, }, - /* 40 Mhz */ { 243.0, /* SGI */ 270.0, }, + { /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, }, + /* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, }, }, /* MCS 15 */ - { /* 20 Mhz */ { 130.0, /* SGI */ 144.4, }, - /* 40 Mhz */ { 270.0, /* SGI */ 300.0, }, + { /* 20 Mhz */ { 130.0f, /* SGI */ 144.4f, }, + /* 40 Mhz */ { 270.0f, /* SGI */ 300.0f, }, }, /* MCS 16 */ - { /* 20 Mhz */ { 19.5, /* SGI */ 21.7, }, - /* 40 Mhz */ { 40.5, /* SGI */ 45.0, }, + { /* 20 Mhz */ { 19.5f, /* SGI */ 21.7f, }, + /* 40 Mhz */ { 40.5f, /* SGI */ 45.0f, }, }, /* MCS 17 */ - { /* 20 Mhz */ { 39.0, /* SGI */ 43.3, }, - /* 40 Mhz */ { 81.0, /* SGI */ 90.0, }, + { /* 20 Mhz */ { 39.0f, /* SGI */ 43.3f, }, + /* 40 Mhz */ { 81.0f, /* SGI */ 90.0f, }, }, /* MCS 18 */ - { /* 20 Mhz */ { 58.5, /* SGI */ 65.0, }, - /* 40 Mhz */ { 121.5, /* SGI */ 135.0, }, + { /* 20 Mhz */ { 58.5f, /* SGI */ 65.0f, }, + /* 40 Mhz */ { 121.5f, /* SGI */ 135.0f, }, }, /* MCS 19 */ - { /* 20 Mhz */ { 78.0, /* SGI */ 86.7, }, - /* 40 Mhz */ { 162.0, /* SGI */ 180.0, }, + { /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, }, + /* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, }, }, /* MCS 20 */ - { /* 20 Mhz */ { 117.0, /* SGI */ 130.0, }, - /* 40 Mhz */ { 243.0, /* SGI */ 270.0, }, + { /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, }, + /* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, }, }, /* MCS 21 */ - { /* 20 Mhz */ { 156.0, /* SGI */ 173.3, }, - /* 40 Mhz */ { 324.0, /* SGI */ 360.0, }, + { /* 20 Mhz */ { 156.0f, /* SGI */ 173.3f, }, + /* 40 Mhz */ { 324.0f, /* SGI */ 360.0f, }, }, /* MCS 22 */ - { /* 20 Mhz */ { 175.5, /* SGI */ 195.0, }, - /* 40 Mhz */ { 364.5, /* SGI */ 405.0, }, + { /* 20 Mhz */ { 175.5f, /* SGI */ 195.0f, }, + /* 40 Mhz */ { 364.5f, /* SGI */ 405.0f, }, }, /* MCS 23 */ - { /* 20 Mhz */ { 195.0, /* SGI */ 216.7, }, - /* 40 Mhz */ { 405.0, /* SGI */ 450.0, }, + { /* 20 Mhz */ { 195.0f, /* SGI */ 216.7f, }, + /* 40 Mhz */ { 405.0f, /* SGI */ 450.0f, }, }, /* MCS 24 */ - { /* 20 Mhz */ { 26.0, /* SGI */ 28.9, }, - /* 40 Mhz */ { 54.0, /* SGI */ 60.0, }, + { /* 20 Mhz */ { 26.0f, /* SGI */ 28.9f, }, + /* 40 Mhz */ { 54.0f, /* SGI */ 60.0f, }, }, /* MCS 25 */ - { /* 20 Mhz */ { 52.0, /* SGI */ 57.8, }, - /* 40 Mhz */ { 108.0, /* SGI */ 120.0, }, + { /* 20 Mhz */ { 52.0f, /* SGI */ 57.8f, }, + /* 40 Mhz */ { 108.0f, /* SGI */ 120.0f, }, }, /* MCS 26 */ - { /* 20 Mhz */ { 78.0, /* SGI */ 86.7, }, - /* 40 Mhz */ { 162.0, /* SGI */ 180.0, }, + { /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, }, + /* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, }, }, /* MCS 27 */ - { /* 20 Mhz */ { 104.0, /* SGI */ 115.6, }, - /* 40 Mhz */ { 216.0, /* SGI */ 240.0, }, + { /* 20 Mhz */ { 104.0f, /* SGI */ 115.6f, }, + /* 40 Mhz */ { 216.0f, /* SGI */ 240.0f, }, }, /* MCS 28 */ - { /* 20 Mhz */ { 156.0, /* SGI */ 173.3, }, - /* 40 Mhz */ { 324.0, /* SGI */ 360.0, }, + { /* 20 Mhz */ { 156.0f, /* SGI */ 173.3f, }, + /* 40 Mhz */ { 324.0f, /* SGI */ 360.0f, }, }, /* MCS 29 */ - { /* 20 Mhz */ { 208.0, /* SGI */ 231.1, }, - /* 40 Mhz */ { 432.0, /* SGI */ 480.0, }, + { /* 20 Mhz */ { 208.0f, /* SGI */ 231.1f, }, + /* 40 Mhz */ { 432.0f, /* SGI */ 480.0f, }, }, /* MCS 30 */ - { /* 20 Mhz */ { 234.0, /* SGI */ 260.0, }, - /* 40 Mhz */ { 486.0, /* SGI */ 540.0, }, + { /* 20 Mhz */ { 234.0f, /* SGI */ 260.0f, }, + /* 40 Mhz */ { 486.0f, /* SGI */ 540.0f, }, }, /* MCS 31 */ - { /* 20 Mhz */ { 260.0, /* SGI */ 288.9, }, - /* 40 Mhz */ { 540.0, /* SGI */ 600.0, }, + { /* 20 Mhz */ { 260.0f, /* SGI */ 288.9f, }, + /* 40 Mhz */ { 540.0f, /* SGI */ 600.0f, }, }, /* MCS 32 */ - { /* 20 Mhz */ { 0.0, /* SGI */ 0.0, }, /* not valid */ - /* 40 Mhz */ { 6.0, /* SGI */ 6.7, }, + { /* 20 Mhz */ { 0.0f, /* SGI */ 0.0f, }, /* not valid */ + /* 40 Mhz */ { 6.0f, /* SGI */ 6.7f, }, }, /* MCS 33 */ - { /* 20 Mhz */ { 39.0, /* SGI */ 43.3, }, - /* 40 Mhz */ { 81.0, /* SGI */ 90.0, }, + { /* 20 Mhz */ { 39.0f, /* SGI */ 43.3f, }, + /* 40 Mhz */ { 81.0f, /* SGI */ 90.0f, }, }, /* MCS 34 */ - { /* 20 Mhz */ { 52.0, /* SGI */ 57.8, }, - /* 40 Mhz */ { 108.0, /* SGI */ 120.0, }, + { /* 20 Mhz */ { 52.0f, /* SGI */ 57.8f, }, + /* 40 Mhz */ { 108.0f, /* SGI */ 120.0f, }, }, /* MCS 35 */ - { /* 20 Mhz */ { 65.0, /* SGI */ 72.2, }, - /* 40 Mhz */ { 135.0, /* SGI */ 150.0, }, + { /* 20 Mhz */ { 65.0f, /* SGI */ 72.2f, }, + /* 40 Mhz */ { 135.0f, /* SGI */ 150.0f, }, }, /* MCS 36 */ - { /* 20 Mhz */ { 58.5, /* SGI */ 65.0, }, - /* 40 Mhz */ { 121.5, /* SGI */ 135.0, }, + { /* 20 Mhz */ { 58.5f, /* SGI */ 65.0f, }, + /* 40 Mhz */ { 121.5f, /* SGI */ 135.0f, }, }, /* MCS 37 */ - { /* 20 Mhz */ { 78.0, /* SGI */ 86.7, }, - /* 40 Mhz */ { 162.0, /* SGI */ 180.0, }, + { /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, }, + /* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, }, }, /* MCS 38 */ - { /* 20 Mhz */ { 97.5, /* SGI */ 108.3, }, - /* 40 Mhz */ { 202.5, /* SGI */ 225.0, }, + { /* 20 Mhz */ { 97.5f, /* SGI */ 108.3f, }, + /* 40 Mhz */ { 202.5f, /* SGI */ 225.0f, }, }, /* MCS 39 */ - { /* 20 Mhz */ { 52.0, /* SGI */ 57.8, }, - /* 40 Mhz */ { 108.0, /* SGI */ 120.0, }, + { /* 20 Mhz */ { 52.0f, /* SGI */ 57.8f, }, + /* 40 Mhz */ { 108.0f, /* SGI */ 120.0f, }, }, /* MCS 40 */ - { /* 20 Mhz */ { 65.0, /* SGI */ 72.2, }, - /* 40 Mhz */ { 135.0, /* SGI */ 150.0, }, + { /* 20 Mhz */ { 65.0f, /* SGI */ 72.2f, }, + /* 40 Mhz */ { 135.0f, /* SGI */ 150.0f, }, }, /* MCS 41 */ - { /* 20 Mhz */ { 65.0, /* SGI */ 72.2, }, - /* 40 Mhz */ { 135.0, /* SGI */ 150.0, }, + { /* 20 Mhz */ { 65.0f, /* SGI */ 72.2f, }, + /* 40 Mhz */ { 135.0f, /* SGI */ 150.0f, }, }, /* MCS 42 */ - { /* 20 Mhz */ { 78.0, /* SGI */ 86.7, }, - /* 40 Mhz */ { 162.0, /* SGI */ 180.0, }, + { /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, }, + /* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, }, }, /* MCS 43 */ - { /* 20 Mhz */ { 91.0, /* SGI */ 101.1, }, - /* 40 Mhz */ { 189.0, /* SGI */ 210.0, }, + { /* 20 Mhz */ { 91.0f, /* SGI */ 101.1f, }, + /* 40 Mhz */ { 189.0f, /* SGI */ 210.0f, }, }, /* MCS 44 */ - { /* 20 Mhz */ { 91.0, /* SGI */ 101.1, }, - /* 40 Mhz */ { 189.0, /* SGI */ 210.0, }, + { /* 20 Mhz */ { 91.0f, /* SGI */ 101.1f, }, + /* 40 Mhz */ { 189.0f, /* SGI */ 210.0f, }, }, /* MCS 45 */ - { /* 20 Mhz */ { 104.0, /* SGI */ 115.6, }, - /* 40 Mhz */ { 216.0, /* SGI */ 240.0, }, + { /* 20 Mhz */ { 104.0f, /* SGI */ 115.6f, }, + /* 40 Mhz */ { 216.0f, /* SGI */ 240.0f, }, }, /* MCS 46 */ - { /* 20 Mhz */ { 78.0, /* SGI */ 86.7, }, - /* 40 Mhz */ { 162.0, /* SGI */ 180.0, }, + { /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, }, + /* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, }, }, /* MCS 47 */ - { /* 20 Mhz */ { 97.5, /* SGI */ 108.3, }, - /* 40 Mhz */ { 202.5, /* SGI */ 225.0, }, + { /* 20 Mhz */ { 97.5f, /* SGI */ 108.3f, }, + /* 40 Mhz */ { 202.5f, /* SGI */ 225.0f, }, }, /* MCS 48 */ - { /* 20 Mhz */ { 97.5, /* SGI */ 108.3, }, - /* 40 Mhz */ { 202.5, /* SGI */ 225.0, }, + { /* 20 Mhz */ { 97.5f, /* SGI */ 108.3f, }, + /* 40 Mhz */ { 202.5f, /* SGI */ 225.0f, }, }, /* MCS 49 */ - { /* 20 Mhz */ { 117.0, /* SGI */ 130.0, }, - /* 40 Mhz */ { 243.0, /* SGI */ 270.0, }, + { /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, }, + /* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, }, }, /* MCS 50 */ - { /* 20 Mhz */ { 136.5, /* SGI */ 151.7, }, - /* 40 Mhz */ { 283.5, /* SGI */ 315.0, }, + { /* 20 Mhz */ { 136.5f, /* SGI */ 151.7f, }, + /* 40 Mhz */ { 283.5f, /* SGI */ 315.0f, }, }, /* MCS 51 */ - { /* 20 Mhz */ { 136.5, /* SGI */ 151.7, }, - /* 40 Mhz */ { 283.5, /* SGI */ 315.0, }, + { /* 20 Mhz */ { 136.5f, /* SGI */ 151.7f, }, + /* 40 Mhz */ { 283.5f, /* SGI */ 315.0f, }, }, /* MCS 52 */ - { /* 20 Mhz */ { 156.0, /* SGI */ 173.3, }, - /* 40 Mhz */ { 324.0, /* SGI */ 360.0, }, + { /* 20 Mhz */ { 156.0f, /* SGI */ 173.3f, }, + /* 40 Mhz */ { 324.0f, /* SGI */ 360.0f, }, }, /* MCS 53 */ - { /* 20 Mhz */ { 65.0, /* SGI */ 72.2, }, - /* 40 Mhz */ { 135.0, /* SGI */ 150.0, }, + { /* 20 Mhz */ { 65.0f, /* SGI */ 72.2f, }, + /* 40 Mhz */ { 135.0f, /* SGI */ 150.0f, }, }, /* MCS 54 */ - { /* 20 Mhz */ { 78.0, /* SGI */ 86.7, }, - /* 40 Mhz */ { 162.0, /* SGI */ 180.0, }, + { /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, }, + /* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, }, }, /* MCS 55 */ - { /* 20 Mhz */ { 91.0, /* SGI */ 101.1, }, - /* 40 Mhz */ { 189.0, /* SGI */ 210.0, }, + { /* 20 Mhz */ { 91.0f, /* SGI */ 101.1f, }, + /* 40 Mhz */ { 189.0f, /* SGI */ 210.0f, }, }, /* MCS 56 */ - { /* 20 Mhz */ { 78.0, /* SGI */ 86.7, }, - /* 40 Mhz */ { 162.0, /* SGI */ 180.0, }, + { /* 20 Mhz */ { 78.0f, /* SGI */ 86.7f, }, + /* 40 Mhz */ { 162.0f, /* SGI */ 180.0f, }, }, /* MCS 57 */ - { /* 20 Mhz */ { 91.0, /* SGI */ 101.1, }, - /* 40 Mhz */ { 189.0, /* SGI */ 210.0, }, + { /* 20 Mhz */ { 91.0f, /* SGI */ 101.1f, }, + /* 40 Mhz */ { 189.0f, /* SGI */ 210.0f, }, }, /* MCS 58 */ - { /* 20 Mhz */ { 104.0, /* SGI */ 115.6, }, - /* 40 Mhz */ { 216.0, /* SGI */ 240.0, }, + { /* 20 Mhz */ { 104.0f, /* SGI */ 115.6f, }, + /* 40 Mhz */ { 216.0f, /* SGI */ 240.0f, }, }, /* MCS 59 */ - { /* 20 Mhz */ { 117.0, /* SGI */ 130.0, }, - /* 40 Mhz */ { 243.0, /* SGI */ 270.0, }, + { /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, }, + /* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, }, }, /* MCS 60 */ - { /* 20 Mhz */ { 104.0, /* SGI */ 115.6, }, - /* 40 Mhz */ { 216.0, /* SGI */ 240.0, }, + { /* 20 Mhz */ { 104.0f, /* SGI */ 115.6f, }, + /* 40 Mhz */ { 216.0f, /* SGI */ 240.0f, }, }, /* MCS 61 */ - { /* 20 Mhz */ { 117.0, /* SGI */ 130.0, }, - /* 40 Mhz */ { 243.0, /* SGI */ 270.0, }, + { /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, }, + /* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, }, }, /* MCS 62 */ - { /* 20 Mhz */ { 130.0, /* SGI */ 144.4, }, - /* 40 Mhz */ { 270.0, /* SGI */ 300.0, }, + { /* 20 Mhz */ { 130.0f, /* SGI */ 144.4f, }, + /* 40 Mhz */ { 270.0f, /* SGI */ 300.0f, }, }, /* MCS 63 */ - { /* 20 Mhz */ { 130.0, /* SGI */ 144.4, }, - /* 40 Mhz */ { 270.0, /* SGI */ 300.0, }, + { /* 20 Mhz */ { 130.0f, /* SGI */ 144.4f, }, + /* 40 Mhz */ { 270.0f, /* SGI */ 300.0f, }, }, /* MCS 64 */ - { /* 20 Mhz */ { 143.0, /* SGI */ 158.9, }, - /* 40 Mhz */ { 297.0, /* SGI */ 330.0, }, + { /* 20 Mhz */ { 143.0f, /* SGI */ 158.9f, }, + /* 40 Mhz */ { 297.0f, /* SGI */ 330.0f, }, }, /* MCS 65 */ - { /* 20 Mhz */ { 97.5, /* SGI */ 108.3, }, - /* 40 Mhz */ { 202.5, /* SGI */ 225.0, }, + { /* 20 Mhz */ { 97.5f, /* SGI */ 108.3f, }, + /* 40 Mhz */ { 202.5f, /* SGI */ 225.0f, }, }, /* MCS 66 */ - { /* 20 Mhz */ { 117.0, /* SGI */ 130.0, }, - /* 40 Mhz */ { 243.0, /* SGI */ 270.0, }, + { /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, }, + /* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, }, }, /* MCS 67 */ - { /* 20 Mhz */ { 136.5, /* SGI */ 151.7, }, - /* 40 Mhz */ { 283.5, /* SGI */ 315.0, }, + { /* 20 Mhz */ { 136.5f, /* SGI */ 151.7f, }, + /* 40 Mhz */ { 283.5f, /* SGI */ 315.0f, }, }, /* MCS 68 */ - { /* 20 Mhz */ { 117.0, /* SGI */ 130.0, }, - /* 40 Mhz */ { 243.0, /* SGI */ 270.0, }, + { /* 20 Mhz */ { 117.0f, /* SGI */ 130.0f, }, + /* 40 Mhz */ { 243.0f, /* SGI */ 270.0f, }, }, /* MCS 69 */ - { /* 20 Mhz */ { 136.5, /* SGI */ 151.7, }, - /* 40 Mhz */ { 283.5, /* SGI */ 315.0, }, + { /* 20 Mhz */ { 136.5f, /* SGI */ 151.7f, }, + /* 40 Mhz */ { 283.5f, /* SGI */ 315.0f, }, }, /* MCS 70 */ - { /* 20 Mhz */ { 156.0, /* SGI */ 173.3, }, - /* 40 Mhz */ { 324.0, /* SGI */ 360.0, }, + { /* 20 Mhz */ { 156.0f, /* SGI */ 173.3f, }, + /* 40 Mhz */ { 324.0f, /* SGI */ 360.0f, }, }, /* MCS 71 */ - { /* 20 Mhz */ { 175.5, /* SGI */ 195.0, }, - /* 40 Mhz */ { 364.5, /* SGI */ 405.0, }, + { /* 20 Mhz */ { 175.5f, /* SGI */ 195.0f, }, + /* 40 Mhz */ { 364.5f, /* SGI */ 405.0f, }, }, /* MCS 72 */ - { /* 20 Mhz */ { 156.0, /* SGI */ 173.3, }, - /* 40 Mhz */ { 324.0, /* SGI */ 360.0, }, + { /* 20 Mhz */ { 156.0f, /* SGI */ 173.3f, }, + /* 40 Mhz */ { 324.0f, /* SGI */ 360.0f, }, }, /* MCS 73 */ - { /* 20 Mhz */ { 175.5, /* SGI */ 195.0, }, - /* 40 Mhz */ { 364.5, /* SGI */ 405.0, }, + { /* 20 Mhz */ { 175.5f, /* SGI */ 195.0f, }, + /* 40 Mhz */ { 364.5f, /* SGI */ 405.0f, }, }, /* MCS 74 */ - { /* 20 Mhz */ { 195.0, /* SGI */ 216.7, }, - /* 40 Mhz */ { 405.0, /* SGI */ 450.0, }, + { /* 20 Mhz */ { 195.0f, /* SGI */ 216.7f, }, + /* 40 Mhz */ { 405.0f, /* SGI */ 450.0f, }, }, /* MCS 75 */ - { /* 20 Mhz */ { 195.0, /* SGI */ 216.7, }, - /* 40 Mhz */ { 405.0, /* SGI */ 450.0, }, + { /* 20 Mhz */ { 195.0f, /* SGI */ 216.7f, }, + /* 40 Mhz */ { 405.0f, /* SGI */ 450.0f, }, }, /* MCS 76 */ - { /* 20 Mhz */ { 214.5, /* SGI */ 238.3, }, - /* 40 Mhz */ { 445.5, /* SGI */ 495.0, }, + { /* 20 Mhz */ { 214.5f, /* SGI */ 238.3f, }, + /* 40 Mhz */ { 445.5f, /* SGI */ 495.0f, }, }, }; static const char *auth_alg_text[]={"Open System","Shared Key","EAP"}; -#define NUM_AUTH_ALGS (sizeof auth_alg_text / sizeof auth_alg_text[0]) +#define NUM_AUTH_ALGS (sizeof(auth_alg_text) / sizeof(auth_alg_text[0])) static const char *status_text[] = { "Successful", /* 0 */ @@ -840,7 +840,7 @@ static const char *status_text[] = { "Reserved", /* 8 */ "Reserved", /* 9 */ "Cannot Support all requested capabilities in the Capability " - "Information field", /* 10 */ + "Information field", /* 10 */ "Reassociation denied due to inability to confirm that association " "exists", /* 11 */ "Association denied due to reason outside the scope of the " @@ -851,9 +851,9 @@ static const char *status_text[] = { "sequence number out of expected sequence", /* 14 */ "Authentication rejected because of challenge failure", /* 15 */ "Authentication rejected due to timeout waiting for next frame in " - "sequence", /* 16 */ + "sequence", /* 16 */ "Association denied because AP is unable to handle additional" - "associated stations", /* 17 */ + "associated stations", /* 17 */ "Association denied due to requesting station not supporting all of " "the data rates in BSSBasicRateSet parameter", /* 18 */ "Association denied due to requesting station not supporting " @@ -908,12 +908,12 @@ static const char *status_text[] = { "The Destination STA is not a QSTA.", /* 50 */ }; -#define NUM_STATUSES (sizeof status_text / sizeof status_text[0]) +#define NUM_STATUSES (sizeof(status_text) / sizeof(status_text[0])) 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 */ @@ -976,28 +976,29 @@ static const char *reason_text[] = { "Association denied due to requesting STA not supporting HT " "features", /* 46 */ }; -#define NUM_REASONS (sizeof reason_text / sizeof reason_text[0]) +#define NUM_REASONS (sizeof(reason_text) / sizeof(reason_text[0])) 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; + ND_TCHECK_LEN(p, IEEE802_11_IV_LEN + IEEE802_11_KID_LEN); iv = EXTRACT_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,17 +1020,15 @@ 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; + goto trunc; elementlen = EXTRACT_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)) { case E_SSID: @@ -1087,7 +1086,7 @@ parse_elements(netdissect_options *ndo, offset += 2; length -= 2; if (rates.length != 0) { - if (rates.length > sizeof rates.rate) + if (rates.length > sizeof(rates.rate)) return 0; memcpy(&rates.rate, p + offset, rates.length); offset += rates.length; @@ -1171,7 +1170,7 @@ parse_elements(netdissect_options *ndo, length -= tim.length; break; } - if (tim.length - 3U > sizeof tim.bitmap) + if (tim.length - 3U > sizeof(tim.bitmap)) return 0; memcpy(&tim.count, p + offset, 3); offset += 3; @@ -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,11 +1222,11 @@ 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; @@ -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,10 +1260,9 @@ 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; + goto trunc; pbody.capability_info = EXTRACT_LE_U_2(p); offset += IEEE802_11_CAPINFO_LEN; length -= IEEE802_11_CAPINFO_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,11 +1289,11 @@ 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; + goto trunc; pbody.capability_info = EXTRACT_LE_U_2(p); offset += IEEE802_11_CAPINFO_LEN; length -= IEEE802_11_CAPINFO_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,11 +1327,11 @@ 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; + goto trunc; pbody.capability_info = EXTRACT_LE_U_2(p); offset += IEEE802_11_CAPINFO_LEN; length -= IEEE802_11_CAPINFO_LEN; @@ -1342,19 +1348,21 @@ 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 Reponse */ + /* Same as a Association Response */ return handle_assoc_response(ndo, p, length); } 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,11 +1388,11 @@ 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; @@ -1402,6 +1410,8 @@ handle_probe_response(netdissect_options *ndo, PRINT_DS_CHANNEL(pbody); return ret; +trunc: + return 0; } static int @@ -1413,16 +1423,15 @@ 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; + goto trunc; pbody.reason_code = EXTRACT_LE_U_2(p); ND_PRINT(": %s", @@ -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,10 +1454,9 @@ 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; + goto trunc; pbody.auth_alg = EXTRACT_LE_U_2(p); 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,27 +1489,28 @@ 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; + goto trunc; pbody.reason_code = EXTRACT_LE_U_2(p); reason = (pbody.reason_code < NUM_REASONS) @@ -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,12 +1579,11 @@ 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 { @@ -1596,6 +1608,8 @@ handle_action(netdissect_options *ndo, 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,8 +1672,7 @@ 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), @@ -1668,55 +1681,50 @@ ctrl_body_print(netdissect_options *ndo, EXTRACT_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)); 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) @@ -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; @@ -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)) @@ -2000,26 +2008,21 @@ ieee_802_11_hdr_print(netdissect_options *ndo, } } -#ifndef roundup2 -#define roundup2(x, y) (((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */ -#endif - -static const char tstr[] = "[|802.11]"; - 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; struct lladdr_info src, dst; int llc_hdrlen; + ndo->ndo_protocol = "802.11"; caplen = orig_caplen; /* Remove FCS, if present */ if (length < fcslen) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return caplen; } length -= fcslen; @@ -2031,7 +2034,7 @@ ieee802_11_print(netdissect_options *ndo, } if (caplen < IEEE802_11_FC_LEN) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return orig_caplen; } @@ -2045,13 +2048,17 @@ ieee802_11_print(netdissect_options *ndo, hdrlen = roundup2(hdrlen, 4); if (ndo->ndo_Hflag && FC_TYPE(fc) == T_DATA && DATA_FRAME_IS_QOS(FC_SUBTYPE(fc))) { + if(!ND_TTEST_1(p + hdrlen)) { + nd_print_trunc(ndo); + return hdrlen; + } meshdrlen = extract_mesh_header_length(p+hdrlen); hdrlen += meshdrlen; } else meshdrlen = 0; if (caplen < hdrlen) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return hdrlen; } @@ -2071,13 +2078,13 @@ ieee802_11_print(netdissect_options *ndo, case T_MGMT: get_mgmt_src_dst_mac(p - hdrlen, &src.addr, &dst.addr); if (!mgmt_body_print(ndo, fc, src.addr, p, length)) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return hdrlen; } break; case T_CTRL: if (!ctrl_body_print(ndo, fc, p - hdrlen)) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return hdrlen; } break; @@ -2088,7 +2095,7 @@ ieee802_11_print(netdissect_options *ndo, if (FC_PROTECTED(fc)) { ND_PRINT("Data"); if (!wep_print(ndo, p)) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return hdrlen; } } else { @@ -2122,8 +2129,9 @@ 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; @@ -3005,15 +3013,15 @@ print_radiotap_field(netdissect_options *ndo, return 0; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return rc; } 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))) @@ -3058,9 +3066,9 @@ print_in_radiotap_namespace(netdissect_options *ndo, return 0; } -static u_int +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) \ @@ -3080,20 +3088,30 @@ ieee802_11_radio_print(netdissect_options *ndo, int pad; u_int fcslen; + ndo->ndo_protocol = "802.11_radio"; if (caplen < sizeof(*hdr)) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return caplen; } hdr = (const struct ieee80211_radiotap_header *)p; len = EXTRACT_LE_U_2(hdr->it_len); + if (len < sizeof(*hdr)) { + /* + * The length is the length of the entire header, so + * it must be as large as the fixed-length part of + * the header. + */ + nd_print_trunc(ndo); + return caplen; + } /* * If we don't have the entire radiotap header, just give up. */ if (caplen < len) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return caplen; } cpack_init(&cpacker, (const uint8_t *)hdr, len); /* align against header start */ @@ -3106,7 +3124,7 @@ ieee802_11_radio_print(netdissect_options *ndo, /* are there more bitmap extensions than bytes in header? */ if ((const u_char*)(last_presentp + 1) > p + len) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return caplen; } @@ -3202,27 +3220,27 @@ ieee802_11_radio_print(netdissect_options *ndo, bit0 = 0; vendor_namespace = 1; if ((cpack_align_and_reserve(&cpacker, 2)) == NULL) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); break; } if (cpack_uint8(&cpacker, &vendor_oui[0]) != 0) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); break; } if (cpack_uint8(&cpacker, &vendor_oui[1]) != 0) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); break; } if (cpack_uint8(&cpacker, &vendor_oui[2]) != 0) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); break; } if (cpack_uint8(&cpacker, &vendor_subnamespace) != 0) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); break; } if (cpack_uint16(&cpacker, &skip_length) != 0) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); break; } break; @@ -3252,13 +3270,14 @@ ieee802_11_radio_print(netdissect_options *ndo, } static u_int -ieee802_11_avs_radio_print(netdissect_options *ndo, - const u_char *p, u_int length, u_int caplen) +ieee802_11_radio_avs_print(netdissect_options *ndo, + const u_char *p, u_int length, u_int caplen) { uint32_t caphdr_len; + ndo->ndo_protocol = "802.11_radio_avs"; if (caplen < 8) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return caplen; } @@ -3269,12 +3288,12 @@ ieee802_11_avs_radio_print(netdissect_options *ndo, * to be large enough to include even the version * cookie or capture header length! */ - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return caplen; } if (caplen < caphdr_len) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return caplen; } @@ -3303,24 +3322,25 @@ ieee802_11_avs_radio_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; uint32_t msgcode; + ndo->ndo_protocol = "prism_if"; if (caplen < 4) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return caplen; } msgcode = EXTRACT_BE_U_4(p); if (msgcode == WLANCAP_MAGIC_COOKIE_V1 || msgcode == WLANCAP_MAGIC_COOKIE_V2) - return ieee802_11_avs_radio_print(ndo, p, length, caplen); + return ieee802_11_radio_avs_print(ndo, p, length, caplen); if (caplen < PRISM_HDR_LEN) { - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return caplen; } @@ -3334,8 +3354,9 @@ 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); } @@ -3346,7 +3367,8 @@ 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) { - return ieee802_11_avs_radio_print(ndo, p, h->len, h->caplen); + ndo->ndo_protocol = "802.11_radio_avs_if"; + return ieee802_11_radio_avs_print(ndo, p, h->len, h->caplen); }