]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-802_11.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
The third argument to linkaddr_string is one of the LINKADDR_ enums.
[tcpdump] / print-802_11.c
diff --git a/print-802_11.c b/print-802_11.c
index 75d979da7e2543da58ff770f32948cec9914cbed..8ddba1e3c18beb94a069587ce03b2db7e6a3e095 100644 (file)
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -20,11 +20,13 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/* \summary: IEEE 802.11 printer */
+
 #ifdef HAVE_CONFIG_H
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <string.h>
 
 
 #include <string.h>
 
@@ -73,22 +75,22 @@
 #define        T_DATA 0x2 /* data */
 #define        T_RESV 0x3  /* reserved */
 
 #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
 #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"    },
 
 static const struct tok st_str[] = {
        { ST_ASSOC_REQUEST,    "Assoc Request"    },
@@ -172,12 +174,12 @@ static const struct tok ctrl_str[] = {
 #define        FC_ORDER(fc)            ((fc) & 0x8000)
 
 struct mgmt_header_t {
 #define        FC_ORDER(fc)            ((fc) & 0x8000)
 
 struct mgmt_header_t {
-       uint16_t        fc;
-       uint16_t        duration;
-       uint8_t         da[IEEE802_11_DA_LEN];
-       uint8_t         sa[IEEE802_11_SA_LEN];
-       uint8_t         bssid[IEEE802_11_BSSID_LEN];
-       uint16_t        seq_ctrl;
+       nd_uint16_t     fc;
+       nd_uint16_t     duration;
+       nd_mac_addr     da;
+       nd_mac_addr     sa;
+       nd_mac_addr     bssid;
+       nd_uint16_t     seq_ctrl;
 };
 
 #define        MGMT_HDRLEN     (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
 };
 
 #define        MGMT_HDRLEN     (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
@@ -213,7 +215,7 @@ struct fh_t {
        uint8_t         length;
        uint16_t        dwell_time;
        uint8_t         hop_set;
        uint8_t         length;
        uint16_t        dwell_time;
        uint8_t         hop_set;
-       uint8_t         hop_pattern;
+       uint8_t hop_pattern;
        uint8_t         hop_index;
 };
 
        uint8_t         hop_index;
 };
 
@@ -229,7 +231,7 @@ struct cf_t {
        uint8_t         count;
        uint8_t         period;
        uint16_t        max_duration;
        uint8_t         count;
        uint8_t         period;
        uint16_t        max_duration;
-       uint16_t        dur_remaing;
+       uint16_t        dur_remaining;
 };
 
 struct tim_t {
 };
 
 struct tim_t {
@@ -241,38 +243,38 @@ struct tim_t {
        uint8_t         bitmap[251];
 };
 
        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 {
 
 
 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;
        u_char          ap[IEEE802_11_AP_LEN];
        uint16_t        reason_code;
        uint16_t        auth_alg;
@@ -283,7 +285,7 @@ struct mgmt_body_t {
        int             ssid_present;
        struct ssid_t   ssid;
        int             rates_present;
        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;
        int             ds_present;
        struct ds_t     ds;
        int             cf_present;
@@ -295,11 +297,11 @@ struct mgmt_body_t {
 };
 
 struct ctrl_control_wrapper_hdr_t {
 };
 
 struct ctrl_control_wrapper_hdr_t {
-       uint16_t        fc;
-       uint16_t        duration;
-       uint8_t         addr1[IEEE802_11_ADDR1_LEN];
-       uint16_t        carried_fc[IEEE802_11_CARRIED_FC_LEN];
-       uint16_t        ht_control[IEEE802_11_HT_CONTROL_LEN];
+       nd_uint16_t     fc;
+       nd_uint16_t     duration;
+       nd_mac_addr     addr1;
+       nd_uint16_t     carried_fc[IEEE802_11_CARRIED_FC_LEN];
+       nd_uint16_t     ht_control[IEEE802_11_HT_CONTROL_LEN];
 };
 
 #define        CTRL_CONTROL_WRAPPER_HDRLEN     (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
 };
 
 #define        CTRL_CONTROL_WRAPPER_HDRLEN     (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
@@ -308,76 +310,76 @@ struct ctrl_control_wrapper_hdr_t {
                                         IEEE802_11_HT_CONTROL_LEN)
 
 struct ctrl_rts_hdr_t {
                                         IEEE802_11_HT_CONTROL_LEN)
 
 struct ctrl_rts_hdr_t {
-       uint16_t        fc;
-       uint16_t        duration;
-       uint8_t         ra[IEEE802_11_RA_LEN];
-       uint8_t         ta[IEEE802_11_TA_LEN];
+       nd_uint16_t     fc;
+       nd_uint16_t     duration;
+       nd_mac_addr     ra;
+       nd_mac_addr     ta;
 };
 
 #define        CTRL_RTS_HDRLEN (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
                         IEEE802_11_RA_LEN+IEEE802_11_TA_LEN)
 
 struct ctrl_cts_hdr_t {
 };
 
 #define        CTRL_RTS_HDRLEN (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
                         IEEE802_11_RA_LEN+IEEE802_11_TA_LEN)
 
 struct ctrl_cts_hdr_t {
-       uint16_t        fc;
-       uint16_t        duration;
-       uint8_t         ra[IEEE802_11_RA_LEN];
+       nd_uint16_t     fc;
+       nd_uint16_t     duration;
+       nd_mac_addr     ra;
 };
 
 #define        CTRL_CTS_HDRLEN (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+IEEE802_11_RA_LEN)
 
 struct ctrl_ack_hdr_t {
 };
 
 #define        CTRL_CTS_HDRLEN (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+IEEE802_11_RA_LEN)
 
 struct ctrl_ack_hdr_t {
-       uint16_t        fc;
-       uint16_t        duration;
-       uint8_t         ra[IEEE802_11_RA_LEN];
+       nd_uint16_t     fc;
+       nd_uint16_t     duration;
+       nd_mac_addr     ra;
 };
 
 #define        CTRL_ACK_HDRLEN (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+IEEE802_11_RA_LEN)
 
 struct ctrl_ps_poll_hdr_t {
 };
 
 #define        CTRL_ACK_HDRLEN (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+IEEE802_11_RA_LEN)
 
 struct ctrl_ps_poll_hdr_t {
-       uint16_t        fc;
-       uint16_t        aid;
-       uint8_t         bssid[IEEE802_11_BSSID_LEN];
-       uint8_t         ta[IEEE802_11_TA_LEN];
+       nd_uint16_t     fc;
+       nd_uint16_t     aid;
+       nd_mac_addr     bssid;
+       nd_mac_addr     ta;
 };
 
 #define        CTRL_PS_POLL_HDRLEN     (IEEE802_11_FC_LEN+IEEE802_11_AID_LEN+\
                                 IEEE802_11_BSSID_LEN+IEEE802_11_TA_LEN)
 
 struct ctrl_end_hdr_t {
 };
 
 #define        CTRL_PS_POLL_HDRLEN     (IEEE802_11_FC_LEN+IEEE802_11_AID_LEN+\
                                 IEEE802_11_BSSID_LEN+IEEE802_11_TA_LEN)
 
 struct ctrl_end_hdr_t {
-       uint16_t        fc;
-       uint16_t        duration;
-       uint8_t         ra[IEEE802_11_RA_LEN];
-       uint8_t         bssid[IEEE802_11_BSSID_LEN];
+       nd_uint16_t     fc;
+       nd_uint16_t     duration;
+       nd_mac_addr     ra;
+       nd_mac_addr     bssid;
 };
 
 #define        CTRL_END_HDRLEN (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
                         IEEE802_11_RA_LEN+IEEE802_11_BSSID_LEN)
 
 struct ctrl_end_ack_hdr_t {
 };
 
 #define        CTRL_END_HDRLEN (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
                         IEEE802_11_RA_LEN+IEEE802_11_BSSID_LEN)
 
 struct ctrl_end_ack_hdr_t {
-       uint16_t        fc;
-       uint16_t        duration;
-       uint8_t         ra[IEEE802_11_RA_LEN];
-       uint8_t         bssid[IEEE802_11_BSSID_LEN];
+       nd_uint16_t     fc;
+       nd_uint16_t     duration;
+       nd_mac_addr     ra;
+       nd_mac_addr     bssid;
 };
 
 #define        CTRL_END_ACK_HDRLEN     (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
                                 IEEE802_11_RA_LEN+IEEE802_11_BSSID_LEN)
 
 struct ctrl_ba_hdr_t {
 };
 
 #define        CTRL_END_ACK_HDRLEN     (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
                                 IEEE802_11_RA_LEN+IEEE802_11_BSSID_LEN)
 
 struct ctrl_ba_hdr_t {
-       uint16_t        fc;
-       uint16_t        duration;
-       uint8_t         ra[IEEE802_11_RA_LEN];
+       nd_uint16_t     fc;
+       nd_uint16_t     duration;
+       nd_mac_addr     ra;
 };
 
 #define        CTRL_BA_HDRLEN  (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+IEEE802_11_RA_LEN)
 
 struct ctrl_bar_hdr_t {
 };
 
 #define        CTRL_BA_HDRLEN  (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+IEEE802_11_RA_LEN)
 
 struct ctrl_bar_hdr_t {
-       uint16_t        fc;
-       uint16_t        dur;
-       uint8_t         ra[IEEE802_11_RA_LEN];
-       uint8_t         ta[IEEE802_11_TA_LEN];
-       uint16_t        ctl;
-       uint16_t        seq;
+       nd_uint16_t     fc;
+       nd_uint16_t     dur;
+       nd_mac_addr     ra;
+       nd_mac_addr     ta;
+       nd_uint16_t     ctl;
+       nd_uint16_t     seq;
 };
 
 #define        CTRL_BAR_HDRLEN         (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
 };
 
 #define        CTRL_BAR_HDRLEN         (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
@@ -385,12 +387,12 @@ struct ctrl_bar_hdr_t {
                                 IEEE802_11_CTL_LEN+IEEE802_11_SEQ_LEN)
 
 struct meshcntl_t {
                                 IEEE802_11_CTL_LEN+IEEE802_11_SEQ_LEN)
 
 struct meshcntl_t {
-       uint8_t         flags;
-       uint8_t         ttl;
-       uint8_t         seq[4];
-       uint8_t         addr4[6];
-       uint8_t         addr5[6];
-       uint8_t         addr6[6];
+       nd_uint8_t      flags;
+       nd_uint8_t      ttl;
+       nd_uint32_t     seq;
+       nd_mac_addr     addr4;
+       nd_mac_addr     addr5;
+       nd_mac_addr     addr6;
 };
 
 #define        IV_IV(iv)       ((iv) & 0xFFFFFF)
 };
 
 #define        IV_IV(iv)       ((iv) & 0xFFFFFF)
@@ -399,13 +401,13 @@ struct meshcntl_t {
 
 #define PRINT_SSID(p) \
        if (p.ssid_present) { \
 
 #define PRINT_SSID(p) \
        if (p.ssid_present) { \
-               ND_PRINT((ndo, " (")); \
-               fn_print(ndo, p.ssid.ssid, NULL); \
-               ND_PRINT((ndo, ")")); \
+               ND_PRINT(" ("); \
+               fn_print_str(ndo, p.ssid.ssid); \
+               ND_PRINT(")"); \
        }
 
 #define PRINT_RATE(_sep, _r, _suf) \
        }
 
 #define PRINT_RATE(_sep, _r, _suf) \
-       ND_PRINT((ndo, "%s%2.1f%s", _sep, (.5 * ((_r) & 0x7f)), _suf))
+       ND_PRINT("%s%2.1f%s", _sep, (.5 * ((_r) & 0x7f)), _suf)
 #define PRINT_RATES(p) \
        if (p.rates_present) { \
                int z; \
 #define PRINT_RATES(p) \
        if (p.rates_present) { \
                int z; \
@@ -416,14 +418,14 @@ struct meshcntl_t {
                        sep = " "; \
                } \
                if (p.rates.length != 0) \
                        sep = " "; \
                } \
                if (p.rates.length != 0) \
-                       ND_PRINT((ndo, " Mbit]")); \
+                       ND_PRINT(" Mbit]"); \
        }
 
 #define PRINT_DS_CHANNEL(p) \
        if (p.ds_present) \
        }
 
 #define PRINT_DS_CHANNEL(p) \
        if (p.ds_present) \
-               ND_PRINT((ndo, " CH: %u", p.ds.channel)); \
-       ND_PRINT((ndo, "%s", \
-           CAPABILITY_PRIVACY(p.capability_info) ? ", PRIVACY" : ""));
+               ND_PRINT(" CH: %u", p.ds.channel); \
+       ND_PRINT("%s", \
+           CAPABILITY_PRIVACY(p.capability_info) ? ", PRIVACY" : "");
 
 #define MAX_MCS_INDEX  76
 
 
 #define MAX_MCS_INDEX  76
 
@@ -438,393 +440,393 @@ struct meshcntl_t {
  */
 static const float ieee80211_float_htrates[MAX_MCS_INDEX+1][2][2] = {
        /* MCS  0  */
  */
 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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  */
        },
 
        /* 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"};
        },
 };
 
 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 */
 
 static const char *status_text[] = {
        "Successful",                                           /*  0 */
@@ -838,7 +840,7 @@ static const char *status_text[] = {
        "Reserved",                                             /*  8 */
        "Reserved",                                             /*  9 */
        "Cannot Support all requested capabilities in the Capability "
        "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 "
        "Reassociation denied due to inability to confirm that association "
          "exists",                                             /* 11 */
        "Association denied due to reason outside the scope of the "
@@ -849,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 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"
        "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 "
        "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 "
@@ -906,12 +908,12 @@ static const char *status_text[] = {
        "The Destination STA is not a QSTA.",                   /* 50 */
 
 };
        "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 */
 
 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 */
        "Deauthenticated because sending station is leaving (or has left) "
          "IBSS or ESS",                                        /* 3 */
        "Disassociated due to inactivity",                      /* 4 */
@@ -954,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 "
        "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 */
          "and/or poor channel conditions",                     /* 34 */
        "Disassociated because STA is transmitting outside the limits "
          "of its TXOPs",                                       /* 35 */
@@ -974,28 +976,29 @@ static const char *reason_text[] = {
        "Association denied due to requesting STA not supporting HT "
          "features",                                           /* 46 */
 };
        "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,
 
 static int
 wep_print(netdissect_options *ndo,
-          const u_char *p)
+         const u_char *p)
 {
        uint32_t iv;
 
 {
        uint32_t iv;
 
-       if (!ND_TTEST2(*p, IEEE802_11_IV_LEN + IEEE802_11_KID_LEN))
-               return 0;
-       iv = EXTRACT_LE_32BITS(p);
+       ND_TCHECK_LEN(p, IEEE802_11_IV_LEN + IEEE802_11_KID_LEN);
+       iv = GET_LE_U_4(p);
 
 
-       ND_PRINT((ndo, " IV:%3x Pad %x KeyID %x", IV_IV(iv), IV_PAD(iv),
-           IV_KEYID(iv)));
+       ND_PRINT(" IV:%3x Pad %x KeyID %x", IV_IV(iv), IV_PAD(iv),
+           IV_KEYID(iv));
 
        return 1;
 
        return 1;
+trunc:
+       return 0;
 }
 
 static int
 parse_elements(netdissect_options *ndo,
 }
 
 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;
 {
        u_int elementlen;
        struct ssid_t ssid;
@@ -1017,19 +1020,17 @@ parse_elements(netdissect_options *ndo,
 
        while (length != 0) {
                /* Make sure we at least have the element ID and length. */
 
        while (length != 0) {
                /* Make sure we at least have the element ID and length. */
-               if (!ND_TTEST2(*(p + offset), 2))
-                       return 0;
+               ND_TCHECK_2(p + offset);
                if (length < 2)
                if (length < 2)
-                       return 0;
-               elementlen = *(p + offset + 1);
+                       goto trunc;
+               elementlen = GET_U_1(p + offset + 1);
 
                /* Make sure we have the entire element. */
 
                /* Make sure we have the entire element. */
-               if (!ND_TTEST2(*(p + offset + 2), elementlen))
-                       return 0;
+               ND_TCHECK_LEN(p + offset + 2, elementlen);
                if (length < elementlen + 2)
                if (length < elementlen + 2)
-                       return 0;
+                       goto trunc;
 
 
-               switch (*(p + offset)) {
+               switch (GET_U_1(p + offset)) {
                case E_SSID:
                        memcpy(&ssid, p + offset, 2);
                        offset += 2;
                case E_SSID:
                        memcpy(&ssid, p + offset, 2);
                        offset += 2;
@@ -1037,10 +1038,6 @@ parse_elements(netdissect_options *ndo,
                        if (ssid.length != 0) {
                                if (ssid.length > sizeof(ssid.ssid) - 1)
                                        return 0;
                        if (ssid.length != 0) {
                                if (ssid.length > sizeof(ssid.ssid) - 1)
                                        return 0;
-                               if (!ND_TTEST2(*(p + offset), ssid.length))
-                                       return 0;
-                               if (length < ssid.length)
-                                       return 0;
                                memcpy(&ssid.ssid, p + offset, ssid.length);
                                offset += ssid.length;
                                length -= ssid.length;
                                memcpy(&ssid.ssid, p + offset, ssid.length);
                                offset += ssid.length;
                                length -= ssid.length;
@@ -1066,10 +1063,6 @@ parse_elements(netdissect_options *ndo,
                                if (challenge.length >
                                    sizeof(challenge.text) - 1)
                                        return 0;
                                if (challenge.length >
                                    sizeof(challenge.text) - 1)
                                        return 0;
-                               if (!ND_TTEST2(*(p + offset), challenge.length))
-                                       return 0;
-                               if (length < challenge.length)
-                                       return 0;
                                memcpy(&challenge.text, p + offset,
                                    challenge.length);
                                offset += challenge.length;
                                memcpy(&challenge.text, p + offset,
                                    challenge.length);
                                offset += challenge.length;
@@ -1093,11 +1086,7 @@ parse_elements(netdissect_options *ndo,
                        offset += 2;
                        length -= 2;
                        if (rates.length != 0) {
                        offset += 2;
                        length -= 2;
                        if (rates.length != 0) {
-                               if (rates.length > sizeof rates.rate)
-                                       return 0;
-                               if (!ND_TTEST2(*(p + offset), rates.length))
-                                       return 0;
-                               if (length < rates.length)
+                               if (rates.length > sizeof(rates.rate))
                                        return 0;
                                memcpy(&rates.rate, p + offset, rates.length);
                                offset += rates.length;
                                        return 0;
                                memcpy(&rates.rate, p + offset, rates.length);
                                offset += rates.length;
@@ -1133,7 +1122,7 @@ parse_elements(netdissect_options *ndo,
                                length -= ds.length;
                                break;
                        }
                                length -= ds.length;
                                break;
                        }
-                       ds.channel = *(p + offset);
+                       ds.channel = GET_U_1(p + offset);
                        offset += 1;
                        length -= 1;
                        /*
                        offset += 1;
                        length -= 1;
                        /*
@@ -1176,19 +1165,18 @@ parse_elements(netdissect_options *ndo,
                        memcpy(&tim, p + offset, 2);
                        offset += 2;
                        length -= 2;
                        memcpy(&tim, p + offset, 2);
                        offset += 2;
                        length -= 2;
-                       if (tim.length <= 3) {
+                       if (tim.length <= 3U) {
                                offset += tim.length;
                                length -= tim.length;
                                break;
                        }
                                offset += tim.length;
                                length -= tim.length;
                                break;
                        }
-                       if (tim.length - 3 > (int)sizeof tim.bitmap)
+                       if (tim.length - 3U > sizeof(tim.bitmap))
                                return 0;
                        memcpy(&tim.count, p + offset, 3);
                        offset += 3;
                        length -= 3;
 
                                return 0;
                        memcpy(&tim.count, p + offset, 3);
                        offset += 3;
                        length -= 3;
 
-                       memcpy(tim.bitmap, p + (tim.length - 3),
-                           (tim.length - 3));
+                       memcpy(tim.bitmap, p + offset, tim.length - 3);
                        offset += tim.length - 3;
                        length -= tim.length - 3;
                        /*
                        offset += tim.length - 3;
                        length -= tim.length - 3;
                        /*
@@ -1205,8 +1193,8 @@ parse_elements(netdissect_options *ndo,
                        break;
                default:
 #if 0
                        break;
                default:
 #if 0
-                       ND_PRINT((ndo, "(1) unhandled element_id (%d)  ",
-                           *(p + offset)));
+                       ND_PRINT("(1) unhandled element_id (%u)  ",
+                           GET_U_1(p + offset));
 #endif
                        offset += 2 + elementlen;
                        length -= 2 + elementlen;
 #endif
                        offset += 2 + elementlen;
                        length -= 2 + elementlen;
@@ -1216,6 +1204,8 @@ parse_elements(netdissect_options *ndo,
 
        /* No problems found. */
        return 1;
 
        /* No problems found. */
        return 1;
+trunc:
+       return 0;
 }
 
 /*********************************************************************************
 }
 
 /*********************************************************************************
@@ -1224,7 +1214,7 @@ parse_elements(netdissect_options *ndo,
 
 static int
 handle_beacon(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;
 {
        struct mgmt_body_t pbody;
        int offset = 0;
@@ -1232,19 +1222,18 @@ handle_beacon(netdissect_options *ndo,
 
        memset(&pbody, 0, sizeof(pbody));
 
 
        memset(&pbody, 0, sizeof(pbody));
 
-       if (!ND_TTEST2(*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)
        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;
        memcpy(&pbody.timestamp, p, IEEE802_11_TSTAMP_LEN);
        offset += IEEE802_11_TSTAMP_LEN;
        length -= IEEE802_11_TSTAMP_LEN;
-       pbody.beacon_interval = EXTRACT_LE_16BITS(p+offset);
+       pbody.beacon_interval = GET_LE_U_2(p + offset);
        offset += IEEE802_11_BCNINT_LEN;
        length -= IEEE802_11_BCNINT_LEN;
        offset += IEEE802_11_BCNINT_LEN;
        length -= IEEE802_11_BCNINT_LEN;
-       pbody.capability_info = EXTRACT_LE_16BITS(p+offset);
+       pbody.capability_info = GET_LE_U_2(p + offset);
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;
 
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;
 
@@ -1252,16 +1241,18 @@ handle_beacon(netdissect_options *ndo,
 
        PRINT_SSID(pbody);
        PRINT_RATES(pbody);
 
        PRINT_SSID(pbody);
        PRINT_RATES(pbody);
-       ND_PRINT((ndo, " %s",
-           CAPABILITY_ESS(pbody.capability_info) ? "ESS" : "IBSS"));
+       ND_PRINT(" %s",
+           CAPABILITY_ESS(pbody.capability_info) ? "ESS" : "IBSS");
        PRINT_DS_CHANNEL(pbody);
 
        return ret;
        PRINT_DS_CHANNEL(pbody);
 
        return ret;
+trunc:
+       return 0;
 }
 
 static int
 handle_assoc_request(netdissect_options *ndo,
 }
 
 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;
 {
        struct mgmt_body_t pbody;
        int offset = 0;
@@ -1269,14 +1260,13 @@ handle_assoc_request(netdissect_options *ndo,
 
        memset(&pbody, 0, sizeof(pbody));
 
 
        memset(&pbody, 0, sizeof(pbody));
 
-       if (!ND_TTEST2(*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)
        if (length < IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN)
-               return 0;
-       pbody.capability_info = EXTRACT_LE_16BITS(p);
+               goto trunc;
+       pbody.capability_info = GET_LE_U_2(p);
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;
-       pbody.listen_interval = EXTRACT_LE_16BITS(p+offset);
+       pbody.listen_interval = GET_LE_U_2(p + offset);
        offset += IEEE802_11_LISTENINT_LEN;
        length -= IEEE802_11_LISTENINT_LEN;
 
        offset += IEEE802_11_LISTENINT_LEN;
        length -= IEEE802_11_LISTENINT_LEN;
 
@@ -1285,11 +1275,13 @@ handle_assoc_request(netdissect_options *ndo,
        PRINT_SSID(pbody);
        PRINT_RATES(pbody);
        return ret;
        PRINT_SSID(pbody);
        PRINT_RATES(pbody);
        return ret;
+trunc:
+       return 0;
 }
 
 static int
 handle_assoc_response(netdissect_options *ndo,
 }
 
 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;
 {
        struct mgmt_body_t pbody;
        int offset = 0;
@@ -1297,36 +1289,37 @@ handle_assoc_response(netdissect_options *ndo,
 
        memset(&pbody, 0, sizeof(pbody));
 
 
        memset(&pbody, 0, sizeof(pbody));
 
-       if (!ND_TTEST2(*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)
        if (length < IEEE802_11_CAPINFO_LEN + IEEE802_11_STATUS_LEN +
            IEEE802_11_AID_LEN)
-               return 0;
-       pbody.capability_info = EXTRACT_LE_16BITS(p);
+               goto trunc;
+       pbody.capability_info = GET_LE_U_2(p);
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;
-       pbody.status_code = EXTRACT_LE_16BITS(p+offset);
+       pbody.status_code = GET_LE_U_2(p + offset);
        offset += IEEE802_11_STATUS_LEN;
        length -= IEEE802_11_STATUS_LEN;
        offset += IEEE802_11_STATUS_LEN;
        length -= IEEE802_11_STATUS_LEN;
-       pbody.aid = EXTRACT_LE_16BITS(p+offset);
+       pbody.aid = GET_LE_U_2(p + offset);
        offset += IEEE802_11_AID_LEN;
        length -= IEEE802_11_AID_LEN;
 
        ret = parse_elements(ndo, &pbody, p, offset, length);
 
        offset += IEEE802_11_AID_LEN;
        length -= IEEE802_11_AID_LEN;
 
        ret = parse_elements(ndo, &pbody, p, offset, length);
 
-       ND_PRINT((ndo, " AID(%x) :%s: %s", ((uint16_t)(pbody.aid << 2 )) >> 2 ,
+       ND_PRINT(" AID(%x) :%s: %s", ((uint16_t)(pbody.aid << 2 )) >> 2 ,
            CAPABILITY_PRIVACY(pbody.capability_info) ? " PRIVACY " : "",
            (pbody.status_code < NUM_STATUSES
                ? status_text[pbody.status_code]
            CAPABILITY_PRIVACY(pbody.capability_info) ? " PRIVACY " : "",
            (pbody.status_code < NUM_STATUSES
                ? status_text[pbody.status_code]
-               : "n/a")));
+               : "n/a"));
 
        return ret;
 
        return ret;
+trunc:
+       return 0;
 }
 
 static int
 handle_reassoc_request(netdissect_options *ndo,
 }
 
 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;
 {
        struct mgmt_body_t pbody;
        int offset = 0;
@@ -1334,16 +1327,15 @@ handle_reassoc_request(netdissect_options *ndo,
 
        memset(&pbody, 0, sizeof(pbody));
 
 
        memset(&pbody, 0, sizeof(pbody));
 
-       if (!ND_TTEST2(*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)
        if (length < IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN +
            IEEE802_11_AP_LEN)
-               return 0;
-       pbody.capability_info = EXTRACT_LE_16BITS(p);
+               goto trunc;
+       pbody.capability_info = GET_LE_U_2(p);
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;
-       pbody.listen_interval = EXTRACT_LE_16BITS(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);
        offset += IEEE802_11_LISTENINT_LEN;
        length -= IEEE802_11_LISTENINT_LEN;
        memcpy(&pbody.ap, p+offset, IEEE802_11_AP_LEN);
@@ -1353,22 +1345,24 @@ handle_reassoc_request(netdissect_options *ndo,
        ret = parse_elements(ndo, &pbody, p, offset, length);
 
        PRINT_SSID(pbody);
        ret = parse_elements(ndo, &pbody, p, offset, length);
 
        PRINT_SSID(pbody);
-       ND_PRINT((ndo, " AP : %s", etheraddr_string(ndo,  pbody.ap )));
+       ND_PRINT(" AP : %s", etheraddr_string(ndo,  pbody.ap ));
 
        return ret;
 
        return ret;
+trunc:
+       return 0;
 }
 
 static int
 handle_reassoc_response(netdissect_options *ndo,
 }
 
 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,
        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;
 {
        struct mgmt_body_t  pbody;
        int offset = 0;
@@ -1386,7 +1380,7 @@ handle_probe_request(netdissect_options *ndo,
 
 static int
 handle_probe_response(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;
 {
        struct mgmt_body_t  pbody;
        int offset = 0;
@@ -1394,19 +1388,18 @@ handle_probe_response(netdissect_options *ndo,
 
        memset(&pbody, 0, sizeof(pbody));
 
 
        memset(&pbody, 0, sizeof(pbody));
 
-       if (!ND_TTEST2(*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)
        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;
        memcpy(&pbody.timestamp, p, IEEE802_11_TSTAMP_LEN);
        offset += IEEE802_11_TSTAMP_LEN;
        length -= IEEE802_11_TSTAMP_LEN;
-       pbody.beacon_interval = EXTRACT_LE_16BITS(p+offset);
+       pbody.beacon_interval = GET_LE_U_2(p + offset);
        offset += IEEE802_11_BCNINT_LEN;
        length -= IEEE802_11_BCNINT_LEN;
        offset += IEEE802_11_BCNINT_LEN;
        length -= IEEE802_11_BCNINT_LEN;
-       pbody.capability_info = EXTRACT_LE_16BITS(p+offset);
+       pbody.capability_info = GET_LE_U_2(p + offset);
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;
 
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;
 
@@ -1417,6 +1410,8 @@ handle_probe_response(netdissect_options *ndo,
        PRINT_DS_CHANNEL(pbody);
 
        return ret;
        PRINT_DS_CHANNEL(pbody);
 
        return ret;
+trunc:
+       return 0;
 }
 
 static int
 }
 
 static int
@@ -1428,29 +1423,30 @@ handle_atim(void)
 
 static int
 handle_disassoc(netdissect_options *ndo,
 
 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));
 
 {
        struct mgmt_body_t  pbody;
 
        memset(&pbody, 0, sizeof(pbody));
 
-       if (!ND_TTEST2(*p, IEEE802_11_REASON_LEN))
-               return 0;
+       ND_TCHECK_LEN(p, IEEE802_11_REASON_LEN);
        if (length < IEEE802_11_REASON_LEN)
        if (length < IEEE802_11_REASON_LEN)
-               return 0;
-       pbody.reason_code = EXTRACT_LE_16BITS(p);
+               goto trunc;
+       pbody.reason_code = GET_LE_U_2(p);
 
 
-       ND_PRINT((ndo, ": %s",
+       ND_PRINT(": %s",
            (pbody.reason_code < NUM_REASONS)
                ? reason_text[pbody.reason_code]
            (pbody.reason_code < NUM_REASONS)
                ? reason_text[pbody.reason_code]
-               : "Reserved"));
+               : "Reserved");
 
        return 1;
 
        return 1;
+trunc:
+       return 0;
 }
 
 static int
 handle_auth(netdissect_options *ndo,
 }
 
 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;
 {
        struct mgmt_body_t  pbody;
        int offset = 0;
@@ -1458,17 +1454,16 @@ handle_auth(netdissect_options *ndo,
 
        memset(&pbody, 0, sizeof(pbody));
 
 
        memset(&pbody, 0, sizeof(pbody));
 
-       if (!ND_TTEST2(*p, 6))
-               return 0;
+       ND_TCHECK_6(p);
        if (length < 6)
        if (length < 6)
-               return 0;
-       pbody.auth_alg = EXTRACT_LE_16BITS(p);
+               goto trunc;
+       pbody.auth_alg = GET_LE_U_2(p);
        offset += 2;
        length -= 2;
        offset += 2;
        length -= 2;
-       pbody.auth_trans_seq_num = EXTRACT_LE_16BITS(p + offset);
+       pbody.auth_trans_seq_num = GET_LE_U_2(p + offset);
        offset += 2;
        length -= 2;
        offset += 2;
        length -= 2;
-       pbody.status_code = EXTRACT_LE_16BITS(p + offset);
+       pbody.status_code = GET_LE_U_2(p + offset);
        offset += 2;
        length -= 2;
 
        offset += 2;
        length -= 2;
 
@@ -1477,148 +1472,144 @@ handle_auth(netdissect_options *ndo,
        if ((pbody.auth_alg == 1) &&
            ((pbody.auth_trans_seq_num == 2) ||
             (pbody.auth_trans_seq_num == 3))) {
        if ((pbody.auth_alg == 1) &&
            ((pbody.auth_trans_seq_num == 2) ||
             (pbody.auth_trans_seq_num == 3))) {
-               ND_PRINT((ndo, " (%s)-%x [Challenge Text] %s",
+               ND_PRINT(" (%s)-%x [Challenge Text] %s",
                    (pbody.auth_alg < NUM_AUTH_ALGS)
                        ? auth_alg_text[pbody.auth_alg]
                        : "Reserved",
                    pbody.auth_trans_seq_num,
                    ((pbody.auth_trans_seq_num % 2)
                    (pbody.auth_alg < NUM_AUTH_ALGS)
                        ? auth_alg_text[pbody.auth_alg]
                        : "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]
                               ? status_text[pbody.status_code]
-                              : "n/a") : "")));
+                              : "n/a") : ""));
                return ret;
        }
                return ret;
        }
-       ND_PRINT((ndo, " (%s)-%x: %s",
+       ND_PRINT(" (%s)-%x: %s",
            (pbody.auth_alg < NUM_AUTH_ALGS)
                ? auth_alg_text[pbody.auth_alg]
                : "Reserved",
            pbody.auth_trans_seq_num,
            (pbody.auth_trans_seq_num % 2)
            (pbody.auth_alg < NUM_AUTH_ALGS)
                ? auth_alg_text[pbody.auth_alg]
                : "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]
                    ? status_text[pbody.status_code]
-                   : "n/a")
-               : ""));
+                   : "n/a")
+               : "");
 
        return ret;
 
        return ret;
+trunc:
+       return 0;
 }
 
 static int
 handle_deauth(netdissect_options *ndo,
 }
 
 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));
 
 {
        struct mgmt_body_t  pbody;
        const char *reason = NULL;
 
        memset(&pbody, 0, sizeof(pbody));
 
-       if (!ND_TTEST2(*p, IEEE802_11_REASON_LEN))
-               return 0;
+       ND_TCHECK_LEN(p, IEEE802_11_REASON_LEN);
        if (length < IEEE802_11_REASON_LEN)
        if (length < IEEE802_11_REASON_LEN)
-               return 0;
-       pbody.reason_code = EXTRACT_LE_16BITS(p);
+               goto trunc;
+       pbody.reason_code = GET_LE_U_2(p);
 
        reason = (pbody.reason_code < NUM_REASONS)
                        ? reason_text[pbody.reason_code]
                        : "Reserved";
 
        if (ndo->ndo_eflag) {
 
        reason = (pbody.reason_code < NUM_REASONS)
                        ? reason_text[pbody.reason_code]
                        : "Reserved";
 
        if (ndo->ndo_eflag) {
-               ND_PRINT((ndo, ": %s", reason));
+               ND_PRINT(": %s", reason);
        } else {
        } else {
-               ND_PRINT((ndo, " (%s): %s", etheraddr_string(ndo, src), reason));
+               ND_PRINT(" (%s): %s", etheraddr_string(ndo, src), reason);
        }
        return 1;
        }
        return 1;
+trunc:
+       return 0;
 }
 
 #define        PRINT_HT_ACTION(v) (\
 }
 
 #define        PRINT_HT_ACTION(v) (\
-       (v) == 0 ? ND_PRINT((ndo, "TxChWidth")) : \
-       (v) == 1 ? ND_PRINT((ndo, "MIMOPwrSave")) : \
-                  ND_PRINT((ndo, "Act#%d", (v))) \
-)
+       (v) == 0 ? ND_PRINT("TxChWidth"): \
+       (v) == 1 ? ND_PRINT("MIMOPwrSave"): \
+                  ND_PRINT("Act#%u", (v)))
 #define        PRINT_BA_ACTION(v) (\
 #define        PRINT_BA_ACTION(v) (\
-       (v) == 0 ? ND_PRINT((ndo, "ADDBA Request")) : \
-       (v) == 1 ? ND_PRINT((ndo, "ADDBA Response")) : \
-       (v) == 2 ? ND_PRINT((ndo, "DELBA")) : \
-                  ND_PRINT((ndo, "Act#%d", (v))) \
-)
+       (v) == 0 ? ND_PRINT("ADDBA Request"): \
+       (v) == 1 ? ND_PRINT("ADDBA Response"): \
+       (v) == 2 ? ND_PRINT("DELBA"): \
+                  ND_PRINT("Act#%u", (v)))
 #define        PRINT_MESHLINK_ACTION(v) (\
 #define        PRINT_MESHLINK_ACTION(v) (\
-       (v) == 0 ? ND_PRINT((ndo, "Request")) : \
-       (v) == 1 ? ND_PRINT((ndo, "Report")) : \
-                  ND_PRINT((ndo, "Act#%d", (v))) \
-)
+       (v) == 0 ? ND_PRINT("Request"): \
+       (v) == 1 ? ND_PRINT("Report"): \
+                  ND_PRINT("Act#%u", (v)))
 #define        PRINT_MESHPEERING_ACTION(v) (\
 #define        PRINT_MESHPEERING_ACTION(v) (\
-       (v) == 0 ? ND_PRINT((ndo, "Open")) : \
-       (v) == 1 ? ND_PRINT((ndo, "Confirm")) : \
-       (v) == 2 ? ND_PRINT((ndo, "Close")) : \
-                  ND_PRINT((ndo, "Act#%d", (v))) \
-)
+       (v) == 0 ? ND_PRINT("Open"): \
+       (v) == 1 ? ND_PRINT("Confirm"): \
+       (v) == 2 ? ND_PRINT("Close"): \
+                  ND_PRINT("Act#%u", (v)))
 #define        PRINT_MESHPATH_ACTION(v) (\
 #define        PRINT_MESHPATH_ACTION(v) (\
-       (v) == 0 ? ND_PRINT((ndo, "Request")) : \
-       (v) == 1 ? ND_PRINT((ndo, "Report")) : \
-       (v) == 2 ? ND_PRINT((ndo, "Error")) : \
-       (v) == 3 ? ND_PRINT((ndo, "RootAnnouncement")) : \
-                  ND_PRINT((ndo, "Act#%d", (v))) \
-)
+       (v) == 0 ? ND_PRINT("Request"): \
+       (v) == 1 ? ND_PRINT("Report"): \
+       (v) == 2 ? ND_PRINT("Error"): \
+       (v) == 3 ? ND_PRINT("RootAnnouncement"): \
+                  ND_PRINT("Act#%u", (v)))
 
 #define PRINT_MESH_ACTION(v) (\
 
 #define PRINT_MESH_ACTION(v) (\
-       (v) == 0 ? ND_PRINT((ndo, "MeshLink")) : \
-       (v) == 1 ? ND_PRINT((ndo, "HWMP")) : \
-       (v) == 2 ? ND_PRINT((ndo, "Gate Announcement")) : \
-       (v) == 3 ? ND_PRINT((ndo, "Congestion Control")) : \
-       (v) == 4 ? ND_PRINT((ndo, "MCCA Setup Request")) : \
-       (v) == 5 ? ND_PRINT((ndo, "MCCA Setup Reply")) : \
-       (v) == 6 ? ND_PRINT((ndo, "MCCA Advertisement Request")) : \
-       (v) == 7 ? ND_PRINT((ndo, "MCCA Advertisement")) : \
-       (v) == 8 ? ND_PRINT((ndo, "MCCA Teardown")) : \
-       (v) == 9 ? ND_PRINT((ndo, "TBTT Adjustment Request")) : \
-       (v) == 10 ? ND_PRINT((ndo, "TBTT Adjustment Response")) : \
-                  ND_PRINT((ndo, "Act#%d", (v))) \
-)
+       (v) == 0 ? ND_PRINT("MeshLink"): \
+       (v) == 1 ? ND_PRINT("HWMP"): \
+       (v) == 2 ? ND_PRINT("Gate Announcement"): \
+       (v) == 3 ? ND_PRINT("Congestion Control"): \
+       (v) == 4 ? ND_PRINT("MCCA Setup Request"): \
+       (v) == 5 ? ND_PRINT("MCCA Setup Reply"): \
+       (v) == 6 ? ND_PRINT("MCCA Advertisement Request"): \
+       (v) == 7 ? ND_PRINT("MCCA Advertisement"): \
+       (v) == 8 ? ND_PRINT("MCCA Teardown"): \
+       (v) == 9 ? ND_PRINT("TBTT Adjustment Request"): \
+       (v) == 10 ? ND_PRINT("TBTT Adjustment Response"): \
+                  ND_PRINT("Act#%u", (v)))
 #define PRINT_MULTIHOP_ACTION(v) (\
 #define PRINT_MULTIHOP_ACTION(v) (\
-       (v) == 0 ? ND_PRINT((ndo, "Proxy Update")) : \
-       (v) == 1 ? ND_PRINT((ndo, "Proxy Update Confirmation")) : \
-                  ND_PRINT((ndo, "Act#%d", (v))) \
-)
+       (v) == 0 ? ND_PRINT("Proxy Update"): \
+       (v) == 1 ? ND_PRINT("Proxy Update Confirmation"): \
+                  ND_PRINT("Act#%u", (v)))
 #define PRINT_SELFPROT_ACTION(v) (\
 #define PRINT_SELFPROT_ACTION(v) (\
-       (v) == 1 ? ND_PRINT((ndo, "Peering Open")) : \
-       (v) == 2 ? ND_PRINT((ndo, "Peering Confirm")) : \
-       (v) == 3 ? ND_PRINT((ndo, "Peering Close")) : \
-       (v) == 4 ? ND_PRINT((ndo, "Group Key Inform")) : \
-       (v) == 5 ? ND_PRINT((ndo, "Group Key Acknowledge")) : \
-                  ND_PRINT((ndo, "Act#%d", (v))) \
-)
+       (v) == 1 ? ND_PRINT("Peering Open"): \
+       (v) == 2 ? ND_PRINT("Peering Confirm"): \
+       (v) == 3 ? ND_PRINT("Peering Close"): \
+       (v) == 4 ? ND_PRINT("Group Key Inform"): \
+       (v) == 5 ? ND_PRINT("Group Key Acknowledge"): \
+                  ND_PRINT("Act#%u", (v)))
 
 static int
 handle_action(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_TTEST2(*p, 2))
-               return 0;
+       ND_TCHECK_2(p);
        if (length < 2)
        if (length < 2)
-               return 0;
+               goto trunc;
        if (ndo->ndo_eflag) {
        if (ndo->ndo_eflag) {
-               ND_PRINT((ndo, ": "));
+               ND_PRINT(": ");
        } else {
        } else {
-               ND_PRINT((ndo, " (%s): ", etheraddr_string(ndo, src)));
+               ND_PRINT(" (%s): ", etheraddr_string(ndo, src));
        }
        }
-       switch (p[0]) {
-       case 0: ND_PRINT((ndo, "Spectrum Management Act#%d", p[1])); break;
-       case 1: ND_PRINT((ndo, "QoS Act#%d", p[1])); break;
-       case 2: ND_PRINT((ndo, "DLS Act#%d", p[1])); break;
-       case 3: ND_PRINT((ndo, "BA ")); PRINT_BA_ACTION(p[1]); break;
-       case 7: ND_PRINT((ndo, "HT ")); PRINT_HT_ACTION(p[1]); break;
-       case 13: ND_PRINT((ndo, "MeshAction ")); PRINT_MESH_ACTION(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:
        case 14:
-               ND_PRINT((ndo, "MultiohopAction "));
-               PRINT_MULTIHOP_ACTION(p[1]); break;
+               ND_PRINT("MultiohopAction ");
+               PRINT_MULTIHOP_ACTION(GET_U_1(p + 1)); break;
        case 15:
        case 15:
-               ND_PRINT((ndo, "SelfprotectAction "));
-               PRINT_SELFPROT_ACTION(p[1]); break;
-       case 127: ND_PRINT((ndo, "Vendor Act#%d", p[1])); break;
+               ND_PRINT("SelfprotectAction ");
+               PRINT_SELFPROT_ACTION(GET_U_1(p + 1)); break;
+       case 127: ND_PRINT("Vendor Act#%u", GET_U_1(p + 1)); break;
        default:
        default:
-               ND_PRINT((ndo, "Reserved(%d) Act#%d", p[0], p[1]));
+               ND_PRINT("Reserved(%u) Act#%u", GET_U_1(p), GET_U_1(p + 1));
                break;
        }
        return 1;
                break;
        }
        return 1;
+trunc:
+       return 0;
 }
 
 
 }
 
 
@@ -1629,9 +1620,9 @@ handle_action(netdissect_options *ndo,
 
 static int
 mgmt_body_print(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((ndo, "%s", tok2str(st_str, "Unhandled Management subtype(%x)", FC_SUBTYPE(fc))));
+       ND_PRINT("%s", tok2str(st_str, "Unhandled Management subtype(%x)", FC_SUBTYPE(fc)));
 
        /* There may be a problem w/ AP not having this bit set */
        if (FC_PROTECTED(fc))
 
        /* There may be a problem w/ AP not having this bit set */
        if (FC_PROTECTED(fc))
@@ -1673,73 +1664,67 @@ mgmt_body_print(netdissect_options *ndo,
 
 static int
 ctrl_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((ndo, "%s", tok2str(ctrl_str, "Unknown Ctrl Subtype", FC_SUBTYPE(fc))));
+       ND_PRINT("%s", tok2str(ctrl_str, "Unknown Ctrl Subtype", FC_SUBTYPE(fc)));
        switch (FC_SUBTYPE(fc)) {
        case CTRL_CONTROL_WRAPPER:
                /* XXX - requires special handling */
                break;
        case CTRL_BAR:
        switch (FC_SUBTYPE(fc)) {
        case CTRL_CONTROL_WRAPPER:
                /* XXX - requires special handling */
                break;
        case CTRL_BAR:
-               if (!ND_TTEST2(*p, CTRL_BAR_HDRLEN))
-                       return 0;
+               ND_TCHECK_LEN(p, CTRL_BAR_HDRLEN);
                if (!ndo->ndo_eflag)
                if (!ndo->ndo_eflag)
-                       ND_PRINT((ndo, " RA:%s TA:%s CTL(%x) SEQ(%u) ",
+                       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),
                            etheraddr_string(ndo, ((const struct ctrl_bar_hdr_t *)p)->ra),
                            etheraddr_string(ndo, ((const struct ctrl_bar_hdr_t *)p)->ta),
-                           EXTRACT_LE_16BITS(&(((const struct ctrl_bar_hdr_t *)p)->ctl)),
-                           EXTRACT_LE_16BITS(&(((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:
                break;
        case CTRL_BA:
-               if (!ND_TTEST2(*p, CTRL_BA_HDRLEN))
-                       return 0;
+               ND_TCHECK_LEN(p, CTRL_BA_HDRLEN);
                if (!ndo->ndo_eflag)
                if (!ndo->ndo_eflag)
-                       ND_PRINT((ndo, " RA:%s ",
-                           etheraddr_string(ndo, ((const struct ctrl_ba_hdr_t *)p)->ra)));
+                       ND_PRINT(" RA:%s ",
+                           etheraddr_string(ndo, ((const struct ctrl_ba_hdr_t *)p)->ra));
                break;
        case CTRL_PS_POLL:
                break;
        case CTRL_PS_POLL:
-               if (!ND_TTEST2(*p, CTRL_PS_POLL_HDRLEN))
-                       return 0;
-               ND_PRINT((ndo, " AID(%x)",
-                   EXTRACT_LE_16BITS(&(((const struct ctrl_ps_poll_hdr_t *)p)->aid))));
+               ND_TCHECK_LEN(p, CTRL_PS_POLL_HDRLEN);
+               ND_PRINT(" AID(%x)",
+                   GET_LE_U_2(((const struct ctrl_ps_poll_hdr_t *)p)->aid));
                break;
        case CTRL_RTS:
                break;
        case CTRL_RTS:
-               if (!ND_TTEST2(*p, CTRL_RTS_HDRLEN))
-                       return 0;
+               ND_TCHECK_LEN(p, CTRL_RTS_HDRLEN);
                if (!ndo->ndo_eflag)
                if (!ndo->ndo_eflag)
-                       ND_PRINT((ndo, " TA:%s ",
-                           etheraddr_string(ndo, ((const struct ctrl_rts_hdr_t *)p)->ta)));
+                       ND_PRINT(" TA:%s ",
+                           etheraddr_string(ndo, ((const struct ctrl_rts_hdr_t *)p)->ta));
                break;
        case CTRL_CTS:
                break;
        case CTRL_CTS:
-               if (!ND_TTEST2(*p, CTRL_CTS_HDRLEN))
-                       return 0;
+               ND_TCHECK_LEN(p, CTRL_CTS_HDRLEN);
                if (!ndo->ndo_eflag)
                if (!ndo->ndo_eflag)
-                       ND_PRINT((ndo, " RA:%s ",
-                           etheraddr_string(ndo, ((const struct ctrl_cts_hdr_t *)p)->ra)));
+                       ND_PRINT(" RA:%s ",
+                           etheraddr_string(ndo, ((const struct ctrl_cts_hdr_t *)p)->ra));
                break;
        case CTRL_ACK:
                break;
        case CTRL_ACK:
-               if (!ND_TTEST2(*p, CTRL_ACK_HDRLEN))
-                       return 0;
+               ND_TCHECK_LEN(p, CTRL_ACK_HDRLEN);
                if (!ndo->ndo_eflag)
                if (!ndo->ndo_eflag)
-                       ND_PRINT((ndo, " RA:%s ",
-                           etheraddr_string(ndo, ((const struct ctrl_ack_hdr_t *)p)->ra)));
+                       ND_PRINT(" RA:%s ",
+                           etheraddr_string(ndo, ((const struct ctrl_ack_hdr_t *)p)->ra));
                break;
        case CTRL_CF_END:
                break;
        case CTRL_CF_END:
-               if (!ND_TTEST2(*p, CTRL_END_HDRLEN))
-                       return 0;
+               ND_TCHECK_LEN(p, CTRL_END_HDRLEN);
                if (!ndo->ndo_eflag)
                if (!ndo->ndo_eflag)
-                       ND_PRINT((ndo, " RA:%s ",
-                           etheraddr_string(ndo, ((const struct ctrl_end_hdr_t *)p)->ra)));
+                       ND_PRINT(" RA:%s ",
+                           etheraddr_string(ndo, ((const struct ctrl_end_hdr_t *)p)->ra));
                break;
        case CTRL_END_ACK:
                break;
        case CTRL_END_ACK:
-               if (!ND_TTEST2(*p, CTRL_END_ACK_HDRLEN))
-                       return 0;
+               ND_TCHECK_LEN(p, CTRL_END_ACK_HDRLEN);
                if (!ndo->ndo_eflag)
                if (!ndo->ndo_eflag)
-                       ND_PRINT((ndo, " RA:%s ",
-                           etheraddr_string(ndo, ((const struct ctrl_end_ack_hdr_t *)p)->ra)));
+                       ND_PRINT(" RA:%s ",
+                           etheraddr_string(ndo, ((const struct ctrl_end_ack_hdr_t *)p)->ra));
                break;
        }
        return 1;
                break;
        }
        return 1;
+trunc:
+       return 0;
 }
 
 /*
 }
 
 /*
@@ -1757,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,
  */
 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)
 {
 #define ADDR1  (p + 4)
 #define ADDR2  (p + 10)
@@ -1814,19 +1799,19 @@ data_header_print(netdissect_options *ndo, uint16_t fc, const u_char *p)
 
        if (DATA_FRAME_IS_CF_ACK(subtype) || DATA_FRAME_IS_CF_POLL(subtype) ||
            DATA_FRAME_IS_QOS(subtype)) {
 
        if (DATA_FRAME_IS_CF_ACK(subtype) || DATA_FRAME_IS_CF_POLL(subtype) ||
            DATA_FRAME_IS_QOS(subtype)) {
-               ND_PRINT((ndo, "CF "));
+               ND_PRINT("CF ");
                if (DATA_FRAME_IS_CF_ACK(subtype)) {
                        if (DATA_FRAME_IS_CF_POLL(subtype))
                if (DATA_FRAME_IS_CF_ACK(subtype)) {
                        if (DATA_FRAME_IS_CF_POLL(subtype))
-                               ND_PRINT((ndo, "Ack/Poll"));
+                               ND_PRINT("Ack/Poll");
                        else
                        else
-                               ND_PRINT((ndo, "Ack"));
+                               ND_PRINT("Ack");
                } else {
                        if (DATA_FRAME_IS_CF_POLL(subtype))
                } else {
                        if (DATA_FRAME_IS_CF_POLL(subtype))
-                               ND_PRINT((ndo, "Poll"));
+                               ND_PRINT("Poll");
                }
                if (DATA_FRAME_IS_QOS(subtype))
                }
                if (DATA_FRAME_IS_QOS(subtype))
-                       ND_PRINT((ndo, "+QoS"));
-               ND_PRINT((ndo, " "));
+                       ND_PRINT("+QoS");
+               ND_PRINT(" ");
        }
 
 #define ADDR1  (p + 4)
        }
 
 #define ADDR1  (p + 4)
@@ -1835,21 +1820,21 @@ data_header_print(netdissect_options *ndo, uint16_t fc, const u_char *p)
 #define ADDR4  (p + 24)
 
        if (!FC_TO_DS(fc) && !FC_FROM_DS(fc)) {
 #define ADDR4  (p + 24)
 
        if (!FC_TO_DS(fc) && !FC_FROM_DS(fc)) {
-               ND_PRINT((ndo, "DA:%s SA:%s BSSID:%s ",
+               ND_PRINT("DA:%s SA:%s BSSID:%s ",
                    etheraddr_string(ndo, ADDR1), etheraddr_string(ndo, ADDR2),
                    etheraddr_string(ndo, ADDR1), etheraddr_string(ndo, ADDR2),
-                   etheraddr_string(ndo, ADDR3)));
+                   etheraddr_string(ndo, ADDR3));
        } else if (!FC_TO_DS(fc) && FC_FROM_DS(fc)) {
        } else if (!FC_TO_DS(fc) && FC_FROM_DS(fc)) {
-               ND_PRINT((ndo, "DA:%s BSSID:%s SA:%s ",
+               ND_PRINT("DA:%s BSSID:%s SA:%s ",
                    etheraddr_string(ndo, ADDR1), etheraddr_string(ndo, ADDR2),
                    etheraddr_string(ndo, ADDR1), etheraddr_string(ndo, ADDR2),
-                   etheraddr_string(ndo, ADDR3)));
+                   etheraddr_string(ndo, ADDR3));
        } else if (FC_TO_DS(fc) && !FC_FROM_DS(fc)) {
        } else if (FC_TO_DS(fc) && !FC_FROM_DS(fc)) {
-               ND_PRINT((ndo, "BSSID:%s SA:%s DA:%s ",
+               ND_PRINT("BSSID:%s SA:%s DA:%s ",
                    etheraddr_string(ndo, ADDR1), etheraddr_string(ndo, ADDR2),
                    etheraddr_string(ndo, ADDR1), etheraddr_string(ndo, ADDR2),
-                   etheraddr_string(ndo, ADDR3)));
+                   etheraddr_string(ndo, ADDR3));
        } else if (FC_TO_DS(fc) && FC_FROM_DS(fc)) {
        } else if (FC_TO_DS(fc) && FC_FROM_DS(fc)) {
-               ND_PRINT((ndo, "RA:%s TA:%s DA:%s SA:%s ",
+               ND_PRINT("RA:%s TA:%s DA:%s SA:%s ",
                    etheraddr_string(ndo, ADDR1), etheraddr_string(ndo, ADDR2),
                    etheraddr_string(ndo, ADDR1), etheraddr_string(ndo, ADDR2),
-                   etheraddr_string(ndo, ADDR3), etheraddr_string(ndo, ADDR4)));
+                   etheraddr_string(ndo, ADDR3), etheraddr_string(ndo, ADDR4));
        }
 
 #undef ADDR1
        }
 
 #undef ADDR1
@@ -1863,9 +1848,9 @@ mgmt_header_print(netdissect_options *ndo, const u_char *p)
 {
        const struct mgmt_header_t *hp = (const struct mgmt_header_t *) p;
 
 {
        const struct mgmt_header_t *hp = (const struct mgmt_header_t *) p;
 
-       ND_PRINT((ndo, "BSSID:%s DA:%s SA:%s ",
+       ND_PRINT("BSSID:%s DA:%s SA:%s ",
            etheraddr_string(ndo, (hp)->bssid), etheraddr_string(ndo, (hp)->da),
            etheraddr_string(ndo, (hp)->bssid), etheraddr_string(ndo, (hp)->da),
-           etheraddr_string(ndo, (hp)->sa)));
+           etheraddr_string(ndo, (hp)->sa));
 }
 
 static void
 }
 
 static void
@@ -1873,43 +1858,43 @@ ctrl_header_print(netdissect_options *ndo, uint16_t fc, const u_char *p)
 {
        switch (FC_SUBTYPE(fc)) {
        case CTRL_BAR:
 {
        switch (FC_SUBTYPE(fc)) {
        case CTRL_BAR:
-               ND_PRINT((ndo, " RA:%s TA:%s CTL(%x) SEQ(%u) ",
+               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),
                    etheraddr_string(ndo, ((const struct ctrl_bar_hdr_t *)p)->ra),
                    etheraddr_string(ndo, ((const struct ctrl_bar_hdr_t *)p)->ta),
-                   EXTRACT_LE_16BITS(&(((const struct ctrl_bar_hdr_t *)p)->ctl)),
-                   EXTRACT_LE_16BITS(&(((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:
                break;
        case CTRL_BA:
-               ND_PRINT((ndo, "RA:%s ",
-                   etheraddr_string(ndo, ((const struct ctrl_ba_hdr_t *)p)->ra)));
+               ND_PRINT("RA:%s ",
+                   etheraddr_string(ndo, ((const struct ctrl_ba_hdr_t *)p)->ra));
                break;
        case CTRL_PS_POLL:
                break;
        case CTRL_PS_POLL:
-               ND_PRINT((ndo, "BSSID:%s TA:%s ",
+               ND_PRINT("BSSID:%s TA:%s ",
                    etheraddr_string(ndo, ((const struct ctrl_ps_poll_hdr_t *)p)->bssid),
                    etheraddr_string(ndo, ((const struct ctrl_ps_poll_hdr_t *)p)->bssid),
-                   etheraddr_string(ndo, ((const struct ctrl_ps_poll_hdr_t *)p)->ta)));
+                   etheraddr_string(ndo, ((const struct ctrl_ps_poll_hdr_t *)p)->ta));
                break;
        case CTRL_RTS:
                break;
        case CTRL_RTS:
-               ND_PRINT((ndo, "RA:%s TA:%s ",
+               ND_PRINT("RA:%s TA:%s ",
                    etheraddr_string(ndo, ((const struct ctrl_rts_hdr_t *)p)->ra),
                    etheraddr_string(ndo, ((const struct ctrl_rts_hdr_t *)p)->ra),
-                   etheraddr_string(ndo, ((const struct ctrl_rts_hdr_t *)p)->ta)));
+                   etheraddr_string(ndo, ((const struct ctrl_rts_hdr_t *)p)->ta));
                break;
        case CTRL_CTS:
                break;
        case CTRL_CTS:
-               ND_PRINT((ndo, "RA:%s ",
-                   etheraddr_string(ndo, ((const struct ctrl_cts_hdr_t *)p)->ra)));
+               ND_PRINT("RA:%s ",
+                   etheraddr_string(ndo, ((const struct ctrl_cts_hdr_t *)p)->ra));
                break;
        case CTRL_ACK:
                break;
        case CTRL_ACK:
-               ND_PRINT((ndo, "RA:%s ",
-                   etheraddr_string(ndo, ((const struct ctrl_ack_hdr_t *)p)->ra)));
+               ND_PRINT("RA:%s ",
+                   etheraddr_string(ndo, ((const struct ctrl_ack_hdr_t *)p)->ra));
                break;
        case CTRL_CF_END:
                break;
        case CTRL_CF_END:
-               ND_PRINT((ndo, "RA:%s BSSID:%s ",
+               ND_PRINT("RA:%s BSSID:%s ",
                    etheraddr_string(ndo, ((const struct ctrl_end_hdr_t *)p)->ra),
                    etheraddr_string(ndo, ((const struct ctrl_end_hdr_t *)p)->ra),
-                   etheraddr_string(ndo, ((const struct ctrl_end_hdr_t *)p)->bssid)));
+                   etheraddr_string(ndo, ((const struct ctrl_end_hdr_t *)p)->bssid));
                break;
        case CTRL_END_ACK:
                break;
        case CTRL_END_ACK:
-               ND_PRINT((ndo, "RA:%s BSSID:%s ",
+               ND_PRINT("RA:%s BSSID:%s ",
                    etheraddr_string(ndo, ((const struct ctrl_end_ack_hdr_t *)p)->ra),
                    etheraddr_string(ndo, ((const struct ctrl_end_ack_hdr_t *)p)->ra),
-                   etheraddr_string(ndo, ((const struct ctrl_end_ack_hdr_t *)p)->bssid)));
+                   etheraddr_string(ndo, ((const struct ctrl_end_ack_hdr_t *)p)->bssid));
                break;
        default:
                /* We shouldn't get here - we should already have quit */
                break;
        default:
                /* We shouldn't get here - we should already have quit */
@@ -1919,7 +1904,7 @@ ctrl_header_print(netdissect_options *ndo, uint16_t fc, const u_char *p)
 
 static int
 extract_header_length(netdissect_options *ndo,
 
 static int
 extract_header_length(netdissect_options *ndo,
-                      uint16_t fc)
+                     uint16_t fc)
 {
        int len;
 
 {
        int len;
 
@@ -1947,7 +1932,7 @@ extract_header_length(netdissect_options *ndo,
                case CTRL_END_ACK:
                        return CTRL_END_ACK_HDRLEN;
                default:
                case CTRL_END_ACK:
                        return CTRL_END_ACK_HDRLEN;
                default:
-                       ND_PRINT((ndo, "unknown 802.11 ctrl frame subtype (%d)", FC_SUBTYPE(fc)));
+                       ND_PRINT("unknown 802.11 ctrl frame subtype (%u)", FC_SUBTYPE(fc));
                        return 0;
                }
        case T_DATA:
                        return 0;
                }
        case T_DATA:
@@ -1956,15 +1941,15 @@ extract_header_length(netdissect_options *ndo,
                        len += 2;
                return len;
        default:
                        len += 2;
                return len;
        default:
-               ND_PRINT((ndo, "unknown 802.11 frame type (%d)", FC_TYPE(fc)));
+               ND_PRINT("unknown 802.11 frame type (%u)", FC_TYPE(fc));
                return 0;
        }
 }
 
 static int
                return 0;
        }
 }
 
 static int
-extract_mesh_header_length(const u_char *p)
+extract_mesh_header_length(netdissect_options *ndo, const u_char *p)
 {
 {
-       return (p[0] &~ 3) ? 0 : 6*(1 + (p[0] & 3));
+       return (GET_U_1(p) &~ 3) ? 0 : 6*(1 + (GET_U_1(p) & 3));
 }
 
 /*
 }
 
 /*
@@ -1972,41 +1957,40 @@ extract_mesh_header_length(const u_char *p)
  */
 static void
 ieee_802_11_hdr_print(netdissect_options *ndo,
  */
 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))
 {
        if (ndo->ndo_vflag) {
                if (FC_MORE_DATA(fc))
-                       ND_PRINT((ndo, "More Data "));
+                       ND_PRINT("More Data ");
                if (FC_MORE_FLAG(fc))
                if (FC_MORE_FLAG(fc))
-                       ND_PRINT((ndo, "More Fragments "));
+                       ND_PRINT("More Fragments ");
                if (FC_POWER_MGMT(fc))
                if (FC_POWER_MGMT(fc))
-                       ND_PRINT((ndo, "Pwr Mgmt "));
+                       ND_PRINT("Pwr Mgmt ");
                if (FC_RETRY(fc))
                if (FC_RETRY(fc))
-                       ND_PRINT((ndo, "Retry "));
+                       ND_PRINT("Retry ");
                if (FC_ORDER(fc))
                if (FC_ORDER(fc))
-                       ND_PRINT((ndo, "Strictly Ordered "));
+                       ND_PRINT("Strictly Ordered ");
                if (FC_PROTECTED(fc))
                if (FC_PROTECTED(fc))
-                       ND_PRINT((ndo, "Protected "));
+                       ND_PRINT("Protected ");
                if (FC_TYPE(fc) != T_CTRL || FC_SUBTYPE(fc) != CTRL_PS_POLL)
                if (FC_TYPE(fc) != T_CTRL || FC_SUBTYPE(fc) != CTRL_PS_POLL)
-                       ND_PRINT((ndo, "%dus ",
-                           EXTRACT_LE_16BITS(
-                               &((const struct mgmt_header_t *)p)->duration)));
+                       ND_PRINT("%uus ",
+                           GET_LE_U_2(((const struct mgmt_header_t *)p)->duration));
        }
        if (meshdrlen != 0) {
                const struct meshcntl_t *mc =
        }
        if (meshdrlen != 0) {
                const struct meshcntl_t *mc =
-                   (const struct meshcntl_t *)&p[hdrlen - meshdrlen];
-               int ae = mc->flags & 3;
+                   (const struct meshcntl_t *)(p + hdrlen - meshdrlen);
+               u_int ae = GET_U_1(mc->flags) & 3;
 
 
-               ND_PRINT((ndo, "MeshData (AE %d TTL %u seq %u", ae, mc->ttl,
-                   EXTRACT_LE_32BITS(mc->seq)));
+               ND_PRINT("MeshData (AE %u TTL %u seq %u", ae,
+                   GET_U_1(mc->ttl), GET_LE_U_4(mc->seq));
                if (ae > 0)
                if (ae > 0)
-                       ND_PRINT((ndo, " A4:%s", etheraddr_string(ndo, mc->addr4)));
+                       ND_PRINT(" A4:%s", etheraddr_string(ndo, mc->addr4));
                if (ae > 1)
                if (ae > 1)
-                       ND_PRINT((ndo, " A5:%s", etheraddr_string(ndo, mc->addr5)));
+                       ND_PRINT(" A5:%s", etheraddr_string(ndo, mc->addr5));
                if (ae > 2)
                if (ae > 2)
-                       ND_PRINT((ndo, " A6:%s", etheraddr_string(ndo, mc->addr6)));
-               ND_PRINT((ndo, ") "));
+                       ND_PRINT(" A6:%s", etheraddr_string(ndo, mc->addr6));
+               ND_PRINT(") ");
        }
 
        switch (FC_TYPE(fc)) {
        }
 
        switch (FC_TYPE(fc)) {
@@ -2024,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,
 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;
 {
        uint16_t fc;
        u_int caplen, hdrlen, meshdrlen;
-       const uint8_t *src, *dst;
+       struct lladdr_info src, dst;
        int llc_hdrlen;
 
        int llc_hdrlen;
 
+       ndo->ndo_protocol = "802.11";
        caplen = orig_caplen;
        /* Remove FCS, if present */
        if (length < fcslen) {
        caplen = orig_caplen;
        /* Remove FCS, if present */
        if (length < fcslen) {
-               ND_PRINT((ndo, "%s", tstr));
+               nd_print_trunc(ndo);
                return caplen;
        }
        length -= fcslen;
                return caplen;
        }
        length -= fcslen;
@@ -2055,11 +2034,11 @@ ieee802_11_print(netdissect_options *ndo,
        }
 
        if (caplen < IEEE802_11_FC_LEN) {
        }
 
        if (caplen < IEEE802_11_FC_LEN) {
-               ND_PRINT((ndo, "%s", tstr));
+               nd_print_trunc(ndo);
                return orig_caplen;
        }
 
                return orig_caplen;
        }
 
-       fc = EXTRACT_LE_16BITS(p);
+       fc = GET_LE_U_2(p);
        hdrlen = extract_header_length(ndo, fc);
        if (hdrlen == 0) {
                /* Unknown frame type or control frame subtype; quit. */
        hdrlen = extract_header_length(ndo, fc);
        if (hdrlen == 0) {
                /* Unknown frame type or control frame subtype; quit. */
@@ -2069,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))) {
                hdrlen = roundup2(hdrlen, 4);
        if (ndo->ndo_Hflag && FC_TYPE(fc) == T_DATA &&
            DATA_FRAME_IS_QOS(FC_SUBTYPE(fc))) {
-               meshdrlen = extract_mesh_header_length(p+hdrlen);
+               if(!ND_TTEST_1(p + hdrlen)) {
+                       nd_print_trunc(ndo);
+                       return hdrlen;
+               }
+               meshdrlen = extract_mesh_header_length(ndo, p + hdrlen);
                hdrlen += meshdrlen;
        } else
                meshdrlen = 0;
 
        if (caplen < hdrlen) {
                hdrlen += meshdrlen;
        } else
                meshdrlen = 0;
 
        if (caplen < hdrlen) {
-               ND_PRINT((ndo, "%s", tstr));
+               nd_print_trunc(ndo);
                return hdrlen;
        }
 
                return hdrlen;
        }
 
@@ -2089,17 +2072,19 @@ ieee802_11_print(netdissect_options *ndo,
        caplen -= hdrlen;
        p += hdrlen;
 
        caplen -= hdrlen;
        p += hdrlen;
 
+       src.addr_string = etheraddr_string;
+       dst.addr_string = etheraddr_string;
        switch (FC_TYPE(fc)) {
        case T_MGMT:
        switch (FC_TYPE(fc)) {
        case T_MGMT:
-               get_mgmt_src_dst_mac(p - hdrlen, &src, &dst);
-               if (!mgmt_body_print(ndo, fc, src, p, length)) {
-                       ND_PRINT((ndo, "%s", tstr));
+               get_mgmt_src_dst_mac(p - hdrlen, &src.addr, &dst.addr);
+               if (!mgmt_body_print(ndo, fc, src.addr, p, length)) {
+                       nd_print_trunc(ndo);
                        return hdrlen;
                }
                break;
        case T_CTRL:
                if (!ctrl_body_print(ndo, fc, p - hdrlen)) {
                        return hdrlen;
                }
                break;
        case T_CTRL:
                if (!ctrl_body_print(ndo, fc, p - hdrlen)) {
-                       ND_PRINT((ndo, "%s", tstr));
+                       nd_print_trunc(ndo);
                        return hdrlen;
                }
                break;
                        return hdrlen;
                }
                break;
@@ -2108,14 +2093,14 @@ ieee802_11_print(netdissect_options *ndo,
                        return hdrlen;  /* no-data frame */
                /* There may be a problem w/ AP not having this bit set */
                if (FC_PROTECTED(fc)) {
                        return hdrlen;  /* no-data frame */
                /* There may be a problem w/ AP not having this bit set */
                if (FC_PROTECTED(fc)) {
-                       ND_PRINT((ndo, "Data"));
+                       ND_PRINT("Data");
                        if (!wep_print(ndo, p)) {
                        if (!wep_print(ndo, p)) {
-                               ND_PRINT((ndo, "%s", tstr));
+                               nd_print_trunc(ndo);
                                return hdrlen;
                        }
                } else {
                                return hdrlen;
                        }
                } else {
-                       get_data_src_dst_mac(fc, p - hdrlen, &src, &dst);
-                       llc_hdrlen = llc_print(ndo, p, length, caplen, src, dst);
+                       get_data_src_dst_mac(fc, p - hdrlen, &src.addr, &dst.addr);
+                       llc_hdrlen = llc_print(ndo, p, length, caplen, &src, &dst);
                        if (llc_hdrlen < 0) {
                                /*
                                 * Some kinds of LLC packet we cannot
                        if (llc_hdrlen < 0) {
                                /*
                                 * Some kinds of LLC packet we cannot
@@ -2144,8 +2129,9 @@ ieee802_11_print(netdissect_options *ndo,
  */
 u_int
 ieee802_11_if_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);
 }
 
        return ieee802_11_print(ndo, p, h->len, h->caplen, 0, 0);
 }
 
@@ -2203,18 +2189,18 @@ ieee802_11_if_print(netdissect_options *ndo,
  * Note well: all radiotap fields are little-endian.
  */
 struct ieee80211_radiotap_header {
  * Note well: all radiotap fields are little-endian.
  */
 struct ieee80211_radiotap_header {
-       uint8_t         it_version;     /* Version 0. Only increases
+       nd_uint8_t      it_version;     /* Version 0. Only increases
                                         * for drastic changes,
                                         * introduction of compatible
                                         * new fields does not count.
                                         */
                                         * for drastic changes,
                                         * introduction of compatible
                                         * new fields does not count.
                                         */
-       uint8_t         it_pad;
-       uint16_t        it_len;         /* length of the whole
+       nd_uint8_t      it_pad;
+       nd_uint16_t     it_len;         /* length of the whole
                                         * header in bytes, including
                                         * it_version, it_pad,
                                         * it_len, and data fields.
                                         */
                                         * header in bytes, including
                                         * it_version, it_pad,
                                         * it_len, and data fields.
                                         */
-       uint32_t       it_present;     /* A bitmap telling which
+       nd_uint32_t     it_present;     /* A bitmap telling which
                                         * fields are present. Set bit 31
                                         * (0x80000000) to extend the
                                         * bitmap by another 32 bits.
                                         * fields are present. Set bit 31
                                         * (0x80000000) to extend the
                                         * bitmap by another 32 bits.
@@ -2249,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.
  *
  *      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.
  *
  *
  *      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.
  *
  *      RF noise power at the antenna, decibel difference from one
  *      milliwatt.
@@ -2290,8 +2276,8 @@ struct ieee80211_radiotap_header {
  *      set at factory calibration.  0 is max power.  Monotonically
  *      nondecreasing with lower power levels.
  *
  *      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
  *
  *      Transmit power expressed as dBm (decibels from a 1 milliwatt
  *      reference). This is the absolute power level measured at
@@ -2311,10 +2297,10 @@ struct ieee80211_radiotap_header {
  *
  *     Properties of received frames. See flags defined below.
  *
  *
  *     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
  *
  *     Extended channel specification: flags (see below) followed by
  *     frequency in MHz, the corresponding IEEE channel number, and
@@ -2322,18 +2308,27 @@ struct ieee80211_radiotap_header {
  *     units.  This property supersedes IEEE80211_RADIOTAP_CHANNEL
  *     and only one of the two should be present.
  *
  *     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
  *     in IEEE 802.11n.
  *
  *
  *     Bitset indicating which fields have known values, followed
  *     by bitset of flag values, followed by the MCS rate index as
  *     in IEEE 802.11n.
  *
+ *
+ * IEEE80211_RADIOTAP_AMPDU_STATUS     u32, u16, u8, u8        unitless
+ *
+ *     Contains the AMPDU information for the subframe.
+ *
+ * IEEE80211_RADIOTAP_VHT      u16, u8, u8, u8[4], u8, u8, u16
+ *
+ *     Contains VHT information about this frame.
+ *
  * IEEE80211_RADIOTAP_VENDOR_NAMESPACE
  *                                     uint8_t  OUI[3]
  * 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
  *
  *     The Vendor Namespace Field contains three sub-fields. The first
  *     sub-field is 3 bytes long. It contains the vendor's IEEE 802
@@ -2360,6 +2355,8 @@ enum ieee80211_radiotap_type {
        /* NB: gap for netbsd definitions */
        IEEE80211_RADIOTAP_XCHANNEL = 18,
        IEEE80211_RADIOTAP_MCS = 19,
        /* NB: gap for netbsd definitions */
        IEEE80211_RADIOTAP_XCHANNEL = 18,
        IEEE80211_RADIOTAP_MCS = 19,
+       IEEE80211_RADIOTAP_AMPDU_STATUS = 20,
+       IEEE80211_RADIOTAP_VHT = 21,
        IEEE80211_RADIOTAP_NAMESPACE = 29,
        IEEE80211_RADIOTAP_VENDOR_NAMESPACE = 30,
        IEEE80211_RADIOTAP_EXT = 31
        IEEE80211_RADIOTAP_NAMESPACE = 29,
        IEEE80211_RADIOTAP_VENDOR_NAMESPACE = 30,
        IEEE80211_RADIOTAP_EXT = 31
@@ -2384,15 +2381,15 @@ enum ieee80211_radiotap_type {
 
 /* Useful combinations of channel characteristics, borrowed from Ethereal */
 #define IEEE80211_CHAN_A \
 
 /* 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 \
 #define IEEE80211_CHAN_B \
-        (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_CCK)
+       (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_CCK)
 #define IEEE80211_CHAN_G \
 #define IEEE80211_CHAN_G \
-        (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN)
+       (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN)
 #define IEEE80211_CHAN_TA \
 #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 \
 #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 */
 
 
 /* For IEEE80211_RADIOTAP_FLAGS */
@@ -2427,6 +2424,8 @@ enum ieee80211_radiotap_type {
 #define IEEE80211_RADIOTAP_MCS_HT_FORMAT_KNOWN         0x08
 #define IEEE80211_RADIOTAP_MCS_FEC_TYPE_KNOWN          0x10
 #define IEEE80211_RADIOTAP_MCS_STBC_KNOWN              0x20
 #define IEEE80211_RADIOTAP_MCS_HT_FORMAT_KNOWN         0x08
 #define IEEE80211_RADIOTAP_MCS_FEC_TYPE_KNOWN          0x10
 #define IEEE80211_RADIOTAP_MCS_STBC_KNOWN              0x20
+#define IEEE80211_RADIOTAP_MCS_NESS_KNOWN              0x40
+#define IEEE80211_RADIOTAP_MCS_NESS_BIT_1              0x80
 
 /* For IEEE80211_RADIOTAP_MCS flags */
 #define IEEE80211_RADIOTAP_MCS_BANDWIDTH_MASK  0x03
 
 /* For IEEE80211_RADIOTAP_MCS flags */
 #define IEEE80211_RADIOTAP_MCS_BANDWIDTH_MASK  0x03
@@ -2442,15 +2441,42 @@ enum ieee80211_radiotap_type {
 #define                IEEE80211_RADIOTAP_MCS_STBC_2   2
 #define                IEEE80211_RADIOTAP_MCS_STBC_3   3
 #define IEEE80211_RADIOTAP_MCS_STBC_SHIFT      5
 #define                IEEE80211_RADIOTAP_MCS_STBC_2   2
 #define                IEEE80211_RADIOTAP_MCS_STBC_3   3
 #define IEEE80211_RADIOTAP_MCS_STBC_SHIFT      5
-
-/* Radiotap state */
-/*  This is used to save state when parsing/processing parameters */
-struct radiotap_state
-{
-       uint32_t        present;
-
-       uint8_t         rate;
-};
+#define IEEE80211_RADIOTAP_MCS_NESS_BIT_0      0x80
+
+/* For IEEE80211_RADIOTAP_AMPDU_STATUS */
+#define IEEE80211_RADIOTAP_AMPDU_REPORT_ZEROLEN                0x0001
+#define IEEE80211_RADIOTAP_AMPDU_IS_ZEROLEN            0x0002
+#define IEEE80211_RADIOTAP_AMPDU_LAST_KNOWN            0x0004
+#define IEEE80211_RADIOTAP_AMPDU_IS_LAST               0x0008
+#define IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_ERR         0x0010
+#define IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_KNOWN       0x0020
+
+/* For IEEE80211_RADIOTAP_VHT known */
+#define IEEE80211_RADIOTAP_VHT_STBC_KNOWN                      0x0001
+#define IEEE80211_RADIOTAP_VHT_TXOP_PS_NA_KNOWN                        0x0002
+#define IEEE80211_RADIOTAP_VHT_GUARD_INTERVAL_KNOWN            0x0004
+#define IEEE80211_RADIOTAP_VHT_SGI_NSYM_DIS_KNOWN              0x0008
+#define IEEE80211_RADIOTAP_VHT_LDPC_EXTRA_OFDM_SYM_KNOWN       0x0010
+#define IEEE80211_RADIOTAP_VHT_BEAMFORMED_KNOWN                        0x0020
+#define IEEE80211_RADIOTAP_VHT_BANDWIDTH_KNOWN                 0x0040
+#define IEEE80211_RADIOTAP_VHT_GROUP_ID_KNOWN                  0x0080
+#define IEEE80211_RADIOTAP_VHT_PARTIAL_AID_KNOWN               0x0100
+
+/* For IEEE80211_RADIOTAP_VHT flags */
+#define IEEE80211_RADIOTAP_VHT_STBC                    0x01
+#define IEEE80211_RADIOTAP_VHT_TXOP_PS_NA              0x02
+#define IEEE80211_RADIOTAP_VHT_SHORT_GI                        0x04
+#define IEEE80211_RADIOTAP_VHT_SGI_NSYM_M10_9          0x08
+#define IEEE80211_RADIOTAP_VHT_LDPC_EXTRA_OFDM_SYM     0x10
+#define IEEE80211_RADIOTAP_VHT_BEAMFORMED              0x20
+
+#define IEEE80211_RADIOTAP_VHT_BANDWIDTH_MASK  0x1f
+
+#define IEEE80211_RADIOTAP_VHT_NSS_MASK                0x0f
+#define IEEE80211_RADIOTAP_VHT_MCS_MASK                0xf0
+#define IEEE80211_RADIOTAP_VHT_MCS_SHIFT       4
+
+#define IEEE80211_RADIOTAP_CODING_LDPC_USERn                   0x01
 
 #define        IEEE80211_CHAN_FHSS \
        (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_GFSK)
 
 #define        IEEE80211_CHAN_FHSS \
        (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_GFSK)
@@ -2478,185 +2504,100 @@ struct radiotap_state
 
 static void
 print_chaninfo(netdissect_options *ndo,
 
 static void
 print_chaninfo(netdissect_options *ndo,
-               int freq, int flags)
+              uint16_t freq, int flags, int presentflags)
 {
 {
-       ND_PRINT((ndo, "%u MHz", freq));
-       if (IS_CHAN_FHSS(flags))
-               ND_PRINT((ndo, " FHSS"));
-       if (IS_CHAN_A(flags)) {
-               if (flags & IEEE80211_CHAN_HALF)
-                       ND_PRINT((ndo, " 11a/10Mhz"));
-               else if (flags & IEEE80211_CHAN_QUARTER)
-                       ND_PRINT((ndo, " 11a/5Mhz"));
-               else
-                       ND_PRINT((ndo, " 11a"));
+       ND_PRINT("%u MHz", freq);
+       if (presentflags & (1 << IEEE80211_RADIOTAP_MCS)) {
+               /*
+                * We have the MCS field, so this is 11n, regardless
+                * of what the channel flags say.
+                */
+               ND_PRINT(" 11n");
+       } else {
+               if (IS_CHAN_FHSS(flags))
+                       ND_PRINT(" FHSS");
+               if (IS_CHAN_A(flags)) {
+                       if (flags & IEEE80211_CHAN_HALF)
+                               ND_PRINT(" 11a/10Mhz");
+                       else if (flags & IEEE80211_CHAN_QUARTER)
+                               ND_PRINT(" 11a/5Mhz");
+                       else
+                               ND_PRINT(" 11a");
+               }
+               if (IS_CHAN_ANYG(flags)) {
+                       if (flags & IEEE80211_CHAN_HALF)
+                               ND_PRINT(" 11g/10Mhz");
+                       else if (flags & IEEE80211_CHAN_QUARTER)
+                               ND_PRINT(" 11g/5Mhz");
+                       else
+                               ND_PRINT(" 11g");
+               } else if (IS_CHAN_B(flags))
+                       ND_PRINT(" 11b");
+               if (flags & IEEE80211_CHAN_TURBO)
+                       ND_PRINT(" Turbo");
        }
        }
-       if (IS_CHAN_ANYG(flags)) {
-               if (flags & IEEE80211_CHAN_HALF)
-                       ND_PRINT((ndo, " 11g/10Mhz"));
-               else if (flags & IEEE80211_CHAN_QUARTER)
-                       ND_PRINT((ndo, " 11g/5Mhz"));
-               else
-                       ND_PRINT((ndo, " 11g"));
-       } else if (IS_CHAN_B(flags))
-               ND_PRINT((ndo, " 11b"));
-       if (flags & IEEE80211_CHAN_TURBO)
-               ND_PRINT((ndo, " Turbo"));
+       /*
+        * These apply to 11n.
+        */
        if (flags & IEEE80211_CHAN_HT20)
        if (flags & IEEE80211_CHAN_HT20)
-               ND_PRINT((ndo, " ht/20"));
+               ND_PRINT(" ht/20");
        else if (flags & IEEE80211_CHAN_HT40D)
        else if (flags & IEEE80211_CHAN_HT40D)
-               ND_PRINT((ndo, " ht/40-"));
+               ND_PRINT(" ht/40-");
        else if (flags & IEEE80211_CHAN_HT40U)
        else if (flags & IEEE80211_CHAN_HT40U)
-               ND_PRINT((ndo, " ht/40+"));
-       ND_PRINT((ndo, " "));
+               ND_PRINT(" ht/40+");
+       ND_PRINT(" ");
 }
 
 static int
 print_radiotap_field(netdissect_options *ndo,
 }
 
 static int
 print_radiotap_field(netdissect_options *ndo,
-                     struct cpack_state *s, uint32_t bit, uint8_t *flags,
-                     struct radiotap_state *state, uint32_t presentflags)
+                    struct cpack_state *s, uint32_t bit, uint8_t *flagsp,
+                    uint32_t presentflags)
 {
 {
-       union {
-               int8_t          i8;
-               uint8_t         u8;
-               int16_t         i16;
-               uint16_t        u16;
-               uint32_t        u32;
-               uint64_t        u64;
-       } u, u2, u3, u4;
+       u_int i;
        int rc;
 
        switch (bit) {
        int rc;
 
        switch (bit) {
-       case IEEE80211_RADIOTAP_FLAGS:
-               rc = cpack_uint8(s, &u.u8);
-               if (rc != 0)
-                       break;
-               *flags = u.u8;
-               break;
-       case IEEE80211_RADIOTAP_RATE:
-               rc = cpack_uint8(s, &u.u8);
-               if (rc != 0)
-                       break;
 
 
-               /* Save state rate */
-               state->rate = u.u8;
-               break;
-       case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
-       case IEEE80211_RADIOTAP_DB_ANTNOISE:
-       case IEEE80211_RADIOTAP_ANTENNA:
-               rc = cpack_uint8(s, &u.u8);
-               break;
-       case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
-       case IEEE80211_RADIOTAP_DBM_ANTNOISE:
-               rc = cpack_int8(s, &u.i8);
-               break;
-       case IEEE80211_RADIOTAP_CHANNEL:
-               rc = cpack_uint16(s, &u.u16);
-               if (rc != 0)
-                       break;
-               rc = cpack_uint16(s, &u2.u16);
-               break;
-       case IEEE80211_RADIOTAP_FHSS:
-       case IEEE80211_RADIOTAP_LOCK_QUALITY:
-       case IEEE80211_RADIOTAP_TX_ATTENUATION:
-       case IEEE80211_RADIOTAP_RX_FLAGS:
-               rc = cpack_uint16(s, &u.u16);
-               break;
-       case IEEE80211_RADIOTAP_DB_TX_ATTENUATION:
-               rc = cpack_uint8(s, &u.u8);
-               break;
-       case IEEE80211_RADIOTAP_DBM_TX_POWER:
-               rc = cpack_int8(s, &u.i8);
-               break;
-       case IEEE80211_RADIOTAP_TSFT:
-               rc = cpack_uint64(s, &u.u64);
-               break;
-       case IEEE80211_RADIOTAP_XCHANNEL:
-               rc = cpack_uint32(s, &u.u32);
-               if (rc != 0)
-                       break;
-               rc = cpack_uint16(s, &u2.u16);
-               if (rc != 0)
-                       break;
-               rc = cpack_uint8(s, &u3.u8);
-               if (rc != 0)
-                       break;
-               rc = cpack_uint8(s, &u4.u8);
-               break;
-       case IEEE80211_RADIOTAP_MCS:
-               rc = cpack_uint8(s, &u.u8);
-               if (rc != 0)
-                       break;
-               rc = cpack_uint8(s, &u2.u8);
+       case IEEE80211_RADIOTAP_TSFT: {
+               uint64_t tsft;
+
+               rc = cpack_uint64(ndo, s, &tsft);
                if (rc != 0)
                if (rc != 0)
-                       break;
-               rc = cpack_uint8(s, &u3.u8);
+                       goto trunc;
+               ND_PRINT("%" PRIu64 "us tsft ", tsft);
                break;
                break;
-       case IEEE80211_RADIOTAP_VENDOR_NAMESPACE: {
-               uint8_t vns[3];
-               uint16_t length;
-               uint8_t subspace;
-
-               if ((cpack_align_and_reserve(s, 2)) == NULL) {
-                       rc = -1;
-                       break;
                }
 
                }
 
-               rc = cpack_uint8(s, &vns[0]);
-               if (rc != 0)
-                       break;
-               rc = cpack_uint8(s, &vns[1]);
-               if (rc != 0)
-                       break;
-               rc = cpack_uint8(s, &vns[2]);
-               if (rc != 0)
-                       break;
-               rc = cpack_uint8(s, &subspace);
-               if (rc != 0)
-                       break;
-               rc = cpack_uint16(s, &length);
-               if (rc != 0)
-                       break;
+       case IEEE80211_RADIOTAP_FLAGS: {
+               uint8_t flagsval;
 
 
-               /* Skip up to length */
-               s->c_next += length;
+               rc = cpack_uint8(ndo, s, &flagsval);
+               if (rc != 0)
+                       goto trunc;
+               *flagsp = flagsval;
+               if (flagsval & IEEE80211_RADIOTAP_F_CFP)
+                       ND_PRINT("cfp ");
+               if (flagsval & IEEE80211_RADIOTAP_F_SHORTPRE)
+                       ND_PRINT("short preamble ");
+               if (flagsval & IEEE80211_RADIOTAP_F_WEP)
+                       ND_PRINT("wep ");
+               if (flagsval & IEEE80211_RADIOTAP_F_FRAG)
+                       ND_PRINT("fragmented ");
+               if (flagsval & IEEE80211_RADIOTAP_F_BADFCS)
+                       ND_PRINT("bad-fcs ");
                break;
                break;
-       }
-       default:
-               /* this bit indicates a field whose
-                * size we do not know, so we cannot
-                * proceed.  Just print the bit number.
-                */
-               ND_PRINT((ndo, "[bit %u] ", bit));
-               return -1;
-       }
-
-       if (rc != 0) {
-               ND_PRINT((ndo, "%s", tstr));
-               return rc;
-       }
+               }
 
 
-       /* Preserve the state present flags */
-       state->present = presentflags;
+       case IEEE80211_RADIOTAP_RATE: {
+               uint8_t rate;
 
 
-       switch (bit) {
-       case IEEE80211_RADIOTAP_CHANNEL:
-               /*
-                * If CHANNEL and XCHANNEL are both present, skip
-                * CHANNEL.
-                */
-               if (presentflags & (1 << IEEE80211_RADIOTAP_XCHANNEL))
-                       break;
-               print_chaninfo(ndo, u.u16, u2.u16);
-               break;
-       case IEEE80211_RADIOTAP_FHSS:
-               ND_PRINT((ndo, "fhset %d fhpat %d ", u.u16 & 0xff, (u.u16 >> 8) & 0xff));
-               break;
-       case IEEE80211_RADIOTAP_RATE:
+               rc = cpack_uint8(ndo, s, &rate);
+               if (rc != 0)
+                       goto trunc;
                /*
                 * XXX On FreeBSD rate & 0x80 means we have an MCS. On
                 * Linux and AirPcap it does not.  (What about
                /*
                 * XXX On FreeBSD rate & 0x80 means we have an MCS. On
                 * Linux and AirPcap it does not.  (What about
-                * Mac OS X, NetBSD, OpenBSD, and DragonFly BSD?)
+                * macOS, NetBSD, OpenBSD, and DragonFly BSD?)
                 *
                 * This is an issue either for proprietary extensions
                 * to 11a or 11g, which do exist, or for 11n
                 *
                 * This is an issue either for proprietary extensions
                 * to 11a or 11g, which do exist, or for 11n
@@ -2674,7 +2615,7 @@ print_radiotap_field(netdissect_options *ndo,
                 * setting.  Such rates do exist, e.g. 11n
                 * MCS 7 at 20 MHz with a long guard interval.
                 */
                 * setting.  Such rates do exist, e.g. 11n
                 * MCS 7 at 20 MHz with a long guard interval.
                 */
-               if (u.u8 >= 0x80 && u.u8 <= 0x8f) {
+               if (rate >= 0x80 && rate <= 0x8f) {
                        /*
                         * XXX - we don't know the channel width
                         * or guard interval length, so we can't
                        /*
                         * XXX - we don't know the channel width
                         * or guard interval length, so we can't
@@ -2691,60 +2632,173 @@ print_radiotap_field(netdissect_options *ndo,
                         * information from Flags, at least on
                         * FreeBSD?
                         */
                         * information from Flags, at least on
                         * FreeBSD?
                         */
-                       ND_PRINT((ndo, "MCS %u ", u.u8 & 0x7f));
+                       ND_PRINT("MCS %u ", rate & 0x7f);
                } else
                } else
-                       ND_PRINT((ndo, "%2.1f Mb/s ", .5 * u.u8));
+                       ND_PRINT("%2.1f Mb/s ", .5 * rate);
                break;
                break;
-       case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
-               ND_PRINT((ndo, "%ddBm signal ", u.i8));
+               }
+
+       case IEEE80211_RADIOTAP_CHANNEL: {
+               uint16_t frequency;
+               uint16_t flags;
+
+               rc = cpack_uint16(ndo, s, &frequency);
+               if (rc != 0)
+                       goto trunc;
+               rc = cpack_uint16(ndo, s, &flags);
+               if (rc != 0)
+                       goto trunc;
+               /*
+                * If CHANNEL and XCHANNEL are both present, skip
+                * CHANNEL.
+                */
+               if (presentflags & (1 << IEEE80211_RADIOTAP_XCHANNEL))
+                       break;
+               print_chaninfo(ndo, frequency, flags, presentflags);
                break;
                break;
-       case IEEE80211_RADIOTAP_DBM_ANTNOISE:
-               ND_PRINT((ndo, "%ddBm noise ", u.i8));
+               }
+
+       case IEEE80211_RADIOTAP_FHSS: {
+               uint8_t hopset;
+               uint8_t hoppat;
+
+               rc = cpack_uint8(ndo, s, &hopset);
+               if (rc != 0)
+                       goto trunc;
+               rc = cpack_uint8(ndo, s, &hoppat);
+               if (rc != 0)
+                       goto trunc;
+               ND_PRINT("fhset %u fhpat %u ", hopset, hoppat);
                break;
                break;
-       case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
-               ND_PRINT((ndo, "%ddB signal ", u.u8));
+               }
+
+       case IEEE80211_RADIOTAP_DBM_ANTSIGNAL: {
+               int8_t dbm_antsignal;
+
+               rc = cpack_int8(ndo, s, &dbm_antsignal);
+               if (rc != 0)
+                       goto trunc;
+               ND_PRINT("%ddBm signal ", dbm_antsignal);
                break;
                break;
-       case IEEE80211_RADIOTAP_DB_ANTNOISE:
-               ND_PRINT((ndo, "%ddB noise ", u.u8));
+               }
+
+       case IEEE80211_RADIOTAP_DBM_ANTNOISE: {
+               int8_t dbm_antnoise;
+
+               rc = cpack_int8(ndo, s, &dbm_antnoise);
+               if (rc != 0)
+                       goto trunc;
+               ND_PRINT("%ddBm noise ", dbm_antnoise);
                break;
                break;
-       case IEEE80211_RADIOTAP_LOCK_QUALITY:
-               ND_PRINT((ndo, "%u sq ", u.u16));
+               }
+
+       case IEEE80211_RADIOTAP_LOCK_QUALITY: {
+               uint16_t lock_quality;
+
+               rc = cpack_uint16(ndo, s, &lock_quality);
+               if (rc != 0)
+                       goto trunc;
+               ND_PRINT("%u sq ", lock_quality);
                break;
                break;
-       case IEEE80211_RADIOTAP_TX_ATTENUATION:
-               ND_PRINT((ndo, "%d tx power ", -(int)u.u16));
+               }
+
+       case IEEE80211_RADIOTAP_TX_ATTENUATION: {
+               int16_t tx_attenuation;
+
+               rc = cpack_int16(ndo, s, &tx_attenuation);
+               if (rc != 0)
+                       goto trunc;
+               ND_PRINT("%d tx power ", -tx_attenuation);
                break;
                break;
-       case IEEE80211_RADIOTAP_DB_TX_ATTENUATION:
-               ND_PRINT((ndo, "%ddB tx power ", -(int)u.u8));
+               }
+
+       case IEEE80211_RADIOTAP_DB_TX_ATTENUATION: {
+               int8_t db_tx_attenuation;
+
+               rc = cpack_int8(ndo, s, &db_tx_attenuation);
+               if (rc != 0)
+                       goto trunc;
+               ND_PRINT("%ddB tx attenuation ", -db_tx_attenuation);
                break;
                break;
-       case IEEE80211_RADIOTAP_DBM_TX_POWER:
-               ND_PRINT((ndo, "%ddBm tx power ", u.i8));
+               }
+
+       case IEEE80211_RADIOTAP_DBM_TX_POWER: {
+               int8_t dbm_tx_power;
+
+               rc = cpack_int8(ndo, s, &dbm_tx_power);
+               if (rc != 0)
+                       goto trunc;
+               ND_PRINT("%ddBm tx power ", dbm_tx_power);
                break;
                break;
-       case IEEE80211_RADIOTAP_FLAGS:
-               if (u.u8 & IEEE80211_RADIOTAP_F_CFP)
-                       ND_PRINT((ndo, "cfp "));
-               if (u.u8 & IEEE80211_RADIOTAP_F_SHORTPRE)
-                       ND_PRINT((ndo, "short preamble "));
-               if (u.u8 & IEEE80211_RADIOTAP_F_WEP)
-                       ND_PRINT((ndo, "wep "));
-               if (u.u8 & IEEE80211_RADIOTAP_F_FRAG)
-                       ND_PRINT((ndo, "fragmented "));
-               if (u.u8 & IEEE80211_RADIOTAP_F_BADFCS)
-                       ND_PRINT((ndo, "bad-fcs "));
+               }
+
+       case IEEE80211_RADIOTAP_ANTENNA: {
+               uint8_t antenna;
+
+               rc = cpack_uint8(ndo, s, &antenna);
+               if (rc != 0)
+                       goto trunc;
+               ND_PRINT("antenna %u ", antenna);
                break;
                break;
-       case IEEE80211_RADIOTAP_ANTENNA:
-               ND_PRINT((ndo, "antenna %d ", u.u8));
+               }
+
+       case IEEE80211_RADIOTAP_DB_ANTSIGNAL: {
+               uint8_t db_antsignal;
+
+               rc = cpack_uint8(ndo, s, &db_antsignal);
+               if (rc != 0)
+                       goto trunc;
+               ND_PRINT("%udB signal ", db_antsignal);
                break;
                break;
-       case IEEE80211_RADIOTAP_TSFT:
-               ND_PRINT((ndo, "%" PRIu64 "us tsft ", u.u64));
+               }
+
+       case IEEE80211_RADIOTAP_DB_ANTNOISE: {
+               uint8_t db_antnoise;
+
+               rc = cpack_uint8(ndo, s, &db_antnoise);
+               if (rc != 0)
+                       goto trunc;
+               ND_PRINT("%udB noise ", db_antnoise);
                break;
                break;
-       case IEEE80211_RADIOTAP_RX_FLAGS:
+               }
+
+       case IEEE80211_RADIOTAP_RX_FLAGS: {
+               uint16_t rx_flags;
+
+               rc = cpack_uint16(ndo, s, &rx_flags);
+               if (rc != 0)
+                       goto trunc;
                /* Do nothing for now */
                break;
                /* Do nothing for now */
                break;
-       case IEEE80211_RADIOTAP_XCHANNEL:
-               print_chaninfo(ndo, u2.u16, u.u32);
+               }
+
+       case IEEE80211_RADIOTAP_XCHANNEL: {
+               uint32_t flags;
+               uint16_t frequency;
+               uint8_t channel;
+               uint8_t maxpower;
+
+               rc = cpack_uint32(ndo, s, &flags);
+               if (rc != 0)
+                       goto trunc;
+               rc = cpack_uint16(ndo, s, &frequency);
+               if (rc != 0)
+                       goto trunc;
+               rc = cpack_uint8(ndo, s, &channel);
+               if (rc != 0)
+                       goto trunc;
+               rc = cpack_uint8(ndo, s, &maxpower);
+               if (rc != 0)
+                       goto trunc;
+               print_chaninfo(ndo, frequency, flags, presentflags);
                break;
                break;
+               }
+
        case IEEE80211_RADIOTAP_MCS: {
        case IEEE80211_RADIOTAP_MCS: {
-               static const char *bandwidth[4] = {
+               uint8_t known;
+               uint8_t flags;
+               uint8_t mcs_index;
+               static const char *ht_bandwidth[4] = {
                        "20 MHz",
                        "40 MHz",
                        "20 MHz (L)",
                        "20 MHz",
                        "40 MHz",
                        "20 MHz (L)",
@@ -2752,25 +2806,34 @@ print_radiotap_field(netdissect_options *ndo,
                };
                float htrate;
 
                };
                float htrate;
 
-               if (u.u8 & IEEE80211_RADIOTAP_MCS_MCS_INDEX_KNOWN) {
+               rc = cpack_uint8(ndo, s, &known);
+               if (rc != 0)
+                       goto trunc;
+               rc = cpack_uint8(ndo, s, &flags);
+               if (rc != 0)
+                       goto trunc;
+               rc = cpack_uint8(ndo, s, &mcs_index);
+               if (rc != 0)
+                       goto trunc;
+               if (known & IEEE80211_RADIOTAP_MCS_MCS_INDEX_KNOWN) {
                        /*
                         * We know the MCS index.
                         */
                        /*
                         * We know the MCS index.
                         */
-                       if (u3.u8 <= MAX_MCS_INDEX) {
+                       if (mcs_index <= MAX_MCS_INDEX) {
                                /*
                                 * And it's in-range.
                                 */
                                /*
                                 * And it's in-range.
                                 */
-                               if (u.u8 & (IEEE80211_RADIOTAP_MCS_BANDWIDTH_KNOWN|IEEE80211_RADIOTAP_MCS_GUARD_INTERVAL_KNOWN)) {
+                               if (known & (IEEE80211_RADIOTAP_MCS_BANDWIDTH_KNOWN|IEEE80211_RADIOTAP_MCS_GUARD_INTERVAL_KNOWN)) {
                                        /*
                                         * And we know both the bandwidth and
                                         * the guard interval, so we can look
                                         * up the rate.
                                         */
                                        htrate =
                                        /*
                                         * And we know both the bandwidth and
                                         * the guard interval, so we can look
                                         * up the rate.
                                         */
                                        htrate =
-                                               ieee80211_float_htrates \
-                                                       [u3.u8] \
-                                                       [((u2.u8 & IEEE80211_RADIOTAP_MCS_BANDWIDTH_MASK) == IEEE80211_RADIOTAP_MCS_BANDWIDTH_40 ? 1 : 0)] \
-                                                       [((u2.u8 & IEEE80211_RADIOTAP_MCS_SHORT_GI) ? 1 : 0)];
+                                               ieee80211_float_htrates
+                                                       [mcs_index]
+                                                       [((flags & IEEE80211_RADIOTAP_MCS_BANDWIDTH_MASK) == IEEE80211_RADIOTAP_MCS_BANDWIDTH_40 ? 1 : 0)]
+                                                       [((flags & IEEE80211_RADIOTAP_MCS_SHORT_GI) ? 1 : 0)];
                                } else {
                                        /*
                                         * We don't know both the bandwidth
                                } else {
                                        /*
                                         * We don't know both the bandwidth
@@ -2790,126 +2853,408 @@ print_radiotap_field(netdissect_options *ndo,
                                 * We have the rate.
                                 * Print it.
                                 */
                                 * We have the rate.
                                 * Print it.
                                 */
-                               ND_PRINT((ndo, "%.1f Mb/s MCS %u ", htrate, u3.u8));
+                               ND_PRINT("%.1f Mb/s MCS %u ", htrate, mcs_index);
                        } else {
                                /*
                                 * We at least have the MCS index.
                                 * Print it.
                                 */
                        } else {
                                /*
                                 * We at least have the MCS index.
                                 * Print it.
                                 */
-                               ND_PRINT((ndo, "MCS %u ", u3.u8));
+                               ND_PRINT("MCS %u ", mcs_index);
                        }
                }
                        }
                }
-               if (u.u8 & IEEE80211_RADIOTAP_MCS_BANDWIDTH_KNOWN) {
-                       ND_PRINT((ndo, "%s ",
-                               bandwidth[u2.u8 & IEEE80211_RADIOTAP_MCS_BANDWIDTH_MASK]));
+               if (known & IEEE80211_RADIOTAP_MCS_BANDWIDTH_KNOWN) {
+                       ND_PRINT("%s ",
+                               ht_bandwidth[flags & IEEE80211_RADIOTAP_MCS_BANDWIDTH_MASK]);
+               }
+               if (known & IEEE80211_RADIOTAP_MCS_GUARD_INTERVAL_KNOWN) {
+                       ND_PRINT("%s GI ",
+                               (flags & IEEE80211_RADIOTAP_MCS_SHORT_GI) ?
+                               "short" : "long");
                }
                }
-               if (u.u8 & IEEE80211_RADIOTAP_MCS_GUARD_INTERVAL_KNOWN) {
-                       ND_PRINT((ndo, "%s GI ",
-                               (u2.u8 & IEEE80211_RADIOTAP_MCS_SHORT_GI) ?
-                               "short" : "lon"));
+               if (known & IEEE80211_RADIOTAP_MCS_HT_FORMAT_KNOWN) {
+                       ND_PRINT("%s ",
+                               (flags & IEEE80211_RADIOTAP_MCS_HT_GREENFIELD) ?
+                               "greenfield" : "mixed");
                }
                }
-               if (u.u8 & IEEE80211_RADIOTAP_MCS_HT_FORMAT_KNOWN) {
-                       ND_PRINT((ndo, "%s ",
-                               (u2.u8 & IEEE80211_RADIOTAP_MCS_HT_GREENFIELD) ?
-                               "greenfield" : "mixed"));
+               if (known & IEEE80211_RADIOTAP_MCS_FEC_TYPE_KNOWN) {
+                       ND_PRINT("%s FEC ",
+                               (flags & IEEE80211_RADIOTAP_MCS_FEC_LDPC) ?
+                               "LDPC" : "BCC");
                }
                }
-               if (u.u8 & IEEE80211_RADIOTAP_MCS_FEC_TYPE_KNOWN) {
-                       ND_PRINT((ndo, "%s FEC ",
-                               (u2.u8 & IEEE80211_RADIOTAP_MCS_FEC_LDPC) ?
-                               "LDPC" : "BCC"));
+               if (known & IEEE80211_RADIOTAP_MCS_STBC_KNOWN) {
+                       ND_PRINT("RX-STBC%u ",
+                               (flags & IEEE80211_RADIOTAP_MCS_STBC_MASK) >> IEEE80211_RADIOTAP_MCS_STBC_SHIFT);
                }
                }
-               if (u.u8 & IEEE80211_RADIOTAP_MCS_STBC_KNOWN) {
-                       ND_PRINT((ndo, "RX-STBC%u ",
-                               (u2.u8 & IEEE80211_RADIOTAP_MCS_STBC_MASK) >> IEEE80211_RADIOTAP_MCS_STBC_SHIFT));
+               break;
                }
 
                }
 
+       case IEEE80211_RADIOTAP_AMPDU_STATUS: {
+               uint32_t reference_num;
+               uint16_t flags;
+               uint8_t delim_crc;
+               uint8_t reserved;
+
+               rc = cpack_uint32(ndo, s, &reference_num);
+               if (rc != 0)
+                       goto trunc;
+               rc = cpack_uint16(ndo, s, &flags);
+               if (rc != 0)
+                       goto trunc;
+               rc = cpack_uint8(ndo, s, &delim_crc);
+               if (rc != 0)
+                       goto trunc;
+               rc = cpack_uint8(ndo, s, &reserved);
+               if (rc != 0)
+                       goto trunc;
+               /* Do nothing for now */
                break;
                }
                break;
                }
+
+       case IEEE80211_RADIOTAP_VHT: {
+               uint16_t known;
+               uint8_t flags;
+               uint8_t bandwidth;
+               uint8_t mcs_nss[4];
+               uint8_t coding;
+               uint8_t group_id;
+               uint16_t partial_aid;
+               static const char *vht_bandwidth[32] = {
+                       "20 MHz",
+                       "40 MHz",
+                       "20 MHz (L)",
+                       "20 MHz (U)",
+                       "80 MHz",
+                       "80 MHz (L)",
+                       "80 MHz (U)",
+                       "80 MHz (LL)",
+                       "80 MHz (LU)",
+                       "80 MHz (UL)",
+                       "80 MHz (UU)",
+                       "160 MHz",
+                       "160 MHz (L)",
+                       "160 MHz (U)",
+                       "160 MHz (LL)",
+                       "160 MHz (LU)",
+                       "160 MHz (UL)",
+                       "160 MHz (UU)",
+                       "160 MHz (LLL)",
+                       "160 MHz (LLU)",
+                       "160 MHz (LUL)",
+                       "160 MHz (UUU)",
+                       "160 MHz (ULL)",
+                       "160 MHz (ULU)",
+                       "160 MHz (UUL)",
+                       "160 MHz (UUU)",
+                       "unknown (26)",
+                       "unknown (27)",
+                       "unknown (28)",
+                       "unknown (29)",
+                       "unknown (30)",
+                       "unknown (31)"
+               };
+
+               rc = cpack_uint16(ndo, s, &known);
+               if (rc != 0)
+                       goto trunc;
+               rc = cpack_uint8(ndo, s, &flags);
+               if (rc != 0)
+                       goto trunc;
+               rc = cpack_uint8(ndo, s, &bandwidth);
+               if (rc != 0)
+                       goto trunc;
+               for (i = 0; i < 4; i++) {
+                       rc = cpack_uint8(ndo, s, &mcs_nss[i]);
+                       if (rc != 0)
+                               goto trunc;
+               }
+               rc = cpack_uint8(ndo, s, &coding);
+               if (rc != 0)
+                       goto trunc;
+               rc = cpack_uint8(ndo, s, &group_id);
+               if (rc != 0)
+                       goto trunc;
+               rc = cpack_uint16(ndo, s, &partial_aid);
+               if (rc != 0)
+                       goto trunc;
+               for (i = 0; i < 4; i++) {
+                       u_int nss, mcs;
+                       nss = mcs_nss[i] & IEEE80211_RADIOTAP_VHT_NSS_MASK;
+                       mcs = (mcs_nss[i] & IEEE80211_RADIOTAP_VHT_MCS_MASK) >> IEEE80211_RADIOTAP_VHT_MCS_SHIFT;
+
+                       if (nss == 0)
+                               continue;
+
+                       ND_PRINT("User %u MCS %u ", i, mcs);
+                       ND_PRINT("%s FEC ",
+                               (coding & (IEEE80211_RADIOTAP_CODING_LDPC_USERn << i)) ?
+                               "LDPC" : "BCC");
+               }
+               if (known & IEEE80211_RADIOTAP_VHT_BANDWIDTH_KNOWN) {
+                       ND_PRINT("%s ",
+                               vht_bandwidth[bandwidth & IEEE80211_RADIOTAP_VHT_BANDWIDTH_MASK]);
+               }
+               if (known & IEEE80211_RADIOTAP_VHT_GUARD_INTERVAL_KNOWN) {
+                       ND_PRINT("%s GI ",
+                               (flags & IEEE80211_RADIOTAP_VHT_SHORT_GI) ?
+                               "short" : "long");
+               }
+               break;
+               }
+
+       default:
+               /* this bit indicates a field whose
+                * size we do not know, so we cannot
+                * proceed.  Just print the bit number.
+                */
+               ND_PRINT("[bit %u] ", bit);
+               return -1;
        }
        }
+
        return 0;
        return 0;
+
+trunc:
+       nd_print_trunc(ndo);
+       return rc;
 }
 
 }
 
-static u_int
-ieee802_11_radio_print(netdissect_options *ndo,
-                       const u_char *p, u_int length, u_int caplen)
+
+static int
+print_in_radiotap_namespace(netdissect_options *ndo,
+                           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)))
 #define        BITNO_8(x) (((x) >> 4) ? 4 + BITNO_4((x) >> 4) : BITNO_4((x)))
 #define        BITNO_4(x) (((x) >> 2) ? 2 + BITNO_2((x) >> 2) : BITNO_2((x)))
 #define        BITNO_2(x) (((x) & 2) ? 1 : 0)
 {
 #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)))
 #define        BITNO_8(x) (((x) >> 4) ? 4 + BITNO_4((x) >> 4) : BITNO_4((x)))
 #define        BITNO_4(x) (((x) >> 2) ? 2 + BITNO_2((x) >> 2) : BITNO_2((x)))
 #define        BITNO_2(x) (((x) & 2) ? 1 : 0)
+       uint32_t present, next_present;
+       int bitno;
+       enum ieee80211_radiotap_type bit;
+       int rc;
+
+       for (present = presentflags; present; present = next_present) {
+               /*
+                * Clear the least significant bit that is set.
+                */
+               next_present = present & (present - 1);
+
+               /*
+                * Get the bit number, within this presence word,
+                * of the remaining least significant bit that
+                * is set.
+                */
+               bitno = BITNO_32(present ^ next_present);
+
+               /*
+                * Stop if this is one of the "same meaning
+                * in all presence flags" bits.
+                */
+               if (bitno >= IEEE80211_RADIOTAP_NAMESPACE)
+                       break;
+
+               /*
+                * Get the radiotap bit number of that bit.
+                */
+               bit = (enum ieee80211_radiotap_type)(bit0 + bitno);
+
+               rc = print_radiotap_field(ndo, s, bit, flags, presentflags);
+               if (rc != 0)
+                       return rc;
+       }
+
+       return 0;
+}
+
+u_int
+ieee802_11_radio_print(netdissect_options *ndo,
+                      const u_char *p, u_int length, u_int caplen)
+{
 #define        BIT(n)  (1U << n)
 #define        IS_EXTENDED(__p)        \
 #define        BIT(n)  (1U << n)
 #define        IS_EXTENDED(__p)        \
-           (EXTRACT_LE_32BITS(__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;
 
        struct cpack_state cpacker;
        const struct ieee80211_radiotap_header *hdr;
-       uint32_t present, next_present;
-       uint32_t presentflags = 0;
-       const uint32_t *presentp, *last_presentp;
-       enum ieee80211_radiotap_type bit;
+       uint32_t presentflags;
+       const nd_uint32_t *presentp, *last_presentp;
+       int vendor_namespace;
+       uint8_t vendor_oui[3];
+       uint8_t vendor_subnamespace;
+       uint16_t skip_length;
        int bit0;
        u_int len;
        uint8_t flags;
        int pad;
        u_int fcslen;
        int bit0;
        u_int len;
        uint8_t flags;
        int pad;
        u_int fcslen;
-       struct radiotap_state state;
 
 
+       ndo->ndo_protocol = "802.11_radio";
        if (caplen < sizeof(*hdr)) {
        if (caplen < sizeof(*hdr)) {
-               ND_PRINT((ndo, "%s", tstr));
+               nd_print_trunc(ndo);
                return caplen;
        }
 
        hdr = (const struct ieee80211_radiotap_header *)p;
 
                return caplen;
        }
 
        hdr = (const struct ieee80211_radiotap_header *)p;
 
-       len = EXTRACT_LE_16BITS(&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
+                * 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) {
        if (caplen < len) {
-               ND_PRINT((ndo, "%s", tstr));
+               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 */
        for (last_presentp = &hdr->it_present;
                return caplen;
        }
        cpack_init(&cpacker, (const uint8_t *)hdr, len); /* align against header start */
        cpack_advance(&cpacker, sizeof(*hdr)); /* includes the 1st bitmap */
        for (last_presentp = &hdr->it_present;
-            IS_EXTENDED(last_presentp) &&
-            (const u_char*)(last_presentp + 1) <= p + len;
+            (const u_char*)(last_presentp + 1) <= p + len &&
+            IS_EXTENDED(last_presentp);
             last_presentp++)
          cpack_advance(&cpacker, sizeof(hdr->it_present)); /* more bitmaps */
 
        /* are there more bitmap extensions than bytes in header? */
             last_presentp++)
          cpack_advance(&cpacker, sizeof(hdr->it_present)); /* more bitmaps */
 
        /* are there more bitmap extensions than bytes in header? */
-       if (IS_EXTENDED(last_presentp)) {
-               ND_PRINT((ndo, "%s", tstr));
+       if ((const u_char*)(last_presentp + 1) > p + len) {
+               nd_print_trunc(ndo);
                return caplen;
        }
 
                return caplen;
        }
 
+       /*
+        * Start out at the beginning of the default radiotap namespace.
+        */
+       bit0 = 0;
+       vendor_namespace = 0;
+       memset(vendor_oui, 0, 3);
+       vendor_subnamespace = 0;
+       skip_length = 0;
        /* Assume no flags */
        flags = 0;
        /* Assume no Atheros padding between 802.11 header and body */
        pad = 0;
        /* Assume no FCS at end of frame */
        fcslen = 0;
        /* Assume no flags */
        flags = 0;
        /* Assume no Atheros padding between 802.11 header and body */
        pad = 0;
        /* Assume no FCS at end of frame */
        fcslen = 0;
-       for (bit0 = 0, presentp = &hdr->it_present; presentp <= last_presentp;
-            presentp++, bit0 += 32) {
-               presentflags = EXTRACT_LE_32BITS(presentp);
+       for (presentp = &hdr->it_present; presentp <= last_presentp;
+           presentp++) {
+               presentflags = GET_LE_U_4(presentp);
 
 
-               /* Clear state. */
-               memset(&state, 0, sizeof(state));
+               /*
+                * If this is a vendor namespace, we don't handle it.
+                */
+               if (vendor_namespace) {
+                       /*
+                        * Skip past the stuff we don't understand.
+                        * If we add support for any vendor namespaces,
+                        * it'd be added here; use vendor_oui and
+                        * vendor_subnamespace to interpret the fields.
+                        */
+                       if (cpack_advance(&cpacker, skip_length) != 0) {
+                               /*
+                                * Ran out of space in the packet.
+                                */
+                               break;
+                       }
+
+                       /*
+                        * We've skipped it all; nothing more to
+                        * skip.
+                        */
+                       skip_length = 0;
+               } else {
+                       if (print_in_radiotap_namespace(ndo, &cpacker,
+                           &flags, presentflags, bit0) != 0) {
+                               /*
+                                * Fatal error - can't process anything
+                                * more in the radiotap header.
+                                */
+                               break;
+                       }
+               }
+
+               /*
+                * Handle the namespace switch bits; we've already handled
+                * the extension bit in all but the last word above.
+                */
+               switch (presentflags &
+                   (BIT(IEEE80211_RADIOTAP_NAMESPACE)|BIT(IEEE80211_RADIOTAP_VENDOR_NAMESPACE))) {
+
+               case 0:
+                       /*
+                        * We're not changing namespaces.
+                        * advance to the next 32 bits in the current
+                        * namespace.
+                        */
+                       bit0 += 32;
+                       break;
 
 
-               for (present = EXTRACT_LE_32BITS(presentp); present;
-                    present = next_present) {
-                       /* clear the least significant bit that is set */
-                       next_present = present & (present - 1);
+               case BIT(IEEE80211_RADIOTAP_NAMESPACE):
+                       /*
+                        * We're switching to the radiotap namespace.
+                        * Reset the presence-bitmap index to 0, and
+                        * reset the namespace to the default radiotap
+                        * namespace.
+                        */
+                       bit0 = 0;
+                       vendor_namespace = 0;
+                       memset(vendor_oui, 0, 3);
+                       vendor_subnamespace = 0;
+                       skip_length = 0;
+                       break;
 
 
-                       /* extract the least significant bit that is set */
-                       bit = (enum ieee80211_radiotap_type)
-                           (bit0 + BITNO_32(present ^ next_present));
+               case BIT(IEEE80211_RADIOTAP_VENDOR_NAMESPACE):
+                       /*
+                        * We're switching to a vendor namespace.
+                        * Reset the presence-bitmap index to 0,
+                        * note that we're in a vendor namespace,
+                        * and fetch the fields of the Vendor Namespace
+                        * item.
+                        */
+                       bit0 = 0;
+                       vendor_namespace = 1;
+                       if ((cpack_align_and_reserve(&cpacker, 2)) == NULL) {
+                               nd_print_trunc(ndo);
+                               break;
+                       }
+                       if (cpack_uint8(ndo, &cpacker, &vendor_oui[0]) != 0) {
+                               nd_print_trunc(ndo);
+                               break;
+                       }
+                       if (cpack_uint8(ndo, &cpacker, &vendor_oui[1]) != 0) {
+                               nd_print_trunc(ndo);
+                               break;
+                       }
+                       if (cpack_uint8(ndo, &cpacker, &vendor_oui[2]) != 0) {
+                               nd_print_trunc(ndo);
+                               break;
+                       }
+                       if (cpack_uint8(ndo, &cpacker, &vendor_subnamespace) != 0) {
+                               nd_print_trunc(ndo);
+                               break;
+                       }
+                       if (cpack_uint16(ndo, &cpacker, &skip_length) != 0) {
+                               nd_print_trunc(ndo);
+                               break;
+                       }
+                       break;
 
 
-                       if (print_radiotap_field(ndo, &cpacker, bit, &flags, &state, presentflags) != 0)
-                               goto out;
+               default:
+                       /*
+                        * Illegal combination.  The behavior in this
+                        * case is undefined by the radiotap spec; we
+                        * just ignore both bits.
+                        */
+                       break;
                }
        }
 
                }
        }
 
-out:
        if (flags & IEEE80211_RADIOTAP_F_DATAPAD)
                pad = 1;        /* Atheros padding */
        if (flags & IEEE80211_RADIOTAP_F_FCS)
        if (flags & IEEE80211_RADIOTAP_F_DATAPAD)
                pad = 1;        /* Atheros padding */
        if (flags & IEEE80211_RADIOTAP_F_FCS)
@@ -2925,29 +3270,30 @@ out:
 }
 
 static u_int
 }
 
 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;
 
 {
        uint32_t caphdr_len;
 
+       ndo->ndo_protocol = "802.11_radio_avs";
        if (caplen < 8) {
        if (caplen < 8) {
-               ND_PRINT((ndo, "%s", tstr));
+               nd_print_trunc(ndo);
                return caplen;
        }
 
                return caplen;
        }
 
-       caphdr_len = EXTRACT_32BITS(p + 4);
+       caphdr_len = GET_BE_U_4(p + 4);
        if (caphdr_len < 8) {
                /*
                 * Yow!  The capture header length is claimed not
                 * to be large enough to include even the version
                 * cookie or capture header length!
                 */
        if (caphdr_len < 8) {
                /*
                 * Yow!  The capture header length is claimed not
                 * to be large enough to include even the version
                 * cookie or capture header length!
                 */
-               ND_PRINT((ndo, "%s", tstr));
+               nd_print_trunc(ndo);
                return caplen;
        }
 
        if (caplen < caphdr_len) {
                return caplen;
        }
 
        if (caplen < caphdr_len) {
-               ND_PRINT((ndo, "%s", tstr));
+               nd_print_trunc(ndo);
                return caplen;
        }
 
                return caplen;
        }
 
@@ -2976,24 +3322,25 @@ ieee802_11_avs_radio_print(netdissect_options *ndo,
  */
 u_int
 prism_if_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;
 
 {
        u_int caplen = h->caplen;
        u_int length = h->len;
        uint32_t msgcode;
 
+       ndo->ndo_protocol = "prism_if";
        if (caplen < 4) {
        if (caplen < 4) {
-               ND_PRINT((ndo, "%s", tstr));
+               nd_print_trunc(ndo);
                return caplen;
        }
 
                return caplen;
        }
 
-       msgcode = EXTRACT_32BITS(p);
+       msgcode = GET_BE_U_4(p);
        if (msgcode == WLANCAP_MAGIC_COOKIE_V1 ||
            msgcode == WLANCAP_MAGIC_COOKIE_V2)
        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) {
 
        if (caplen < PRISM_HDR_LEN) {
-               ND_PRINT((ndo, "%s", tstr));
+               nd_print_trunc(ndo);
                return caplen;
        }
 
                return caplen;
        }
 
@@ -3007,8 +3354,9 @@ prism_if_print(netdissect_options *ndo,
  */
 u_int
 ieee802_11_radio_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);
 }
 
        return ieee802_11_radio_print(ndo, p, h->len, h->caplen);
 }
 
@@ -3019,7 +3367,8 @@ ieee802_11_radio_if_print(netdissect_options *ndo,
  */
 u_int
 ieee802_11_radio_avs_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);
 }
 }
[mirror] the TCPdump network dissector