CI: Add warning exemptions for Sun C (suncc-5.15) on Solaris 10

[tcpdump] / print-802_11.c
diff --git a/print-802_11.c b/print-802_11.c

index 02e8cb2efc21bde9507961d0a04462746d7c19d2..6f3bbee8cd5f8a696c8b7dbb055e8ff77609f5b9 100644 (file)
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -20,11 +20,11 @@
   * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   */
  
   * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   */
  
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* \summary: IEEE 802.11 printer */
+
+#include <config.h>
  
  
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
  
  #include <string.h>
  
  
  #include <string.h>
  
@@ -65,7 +65,7 @@
  #define        IEEE802_11_STATUS_LEN           2
  #define        IEEE802_11_REASON_LEN           2
  
  #define        IEEE802_11_STATUS_LEN           2
  #define        IEEE802_11_REASON_LEN           2
  
-/* Length of previous AP in reassocation frame */
+/* Length of previous AP in reassociation frame */
  #define        IEEE802_11_AP_LEN               6
  
  #define        T_MGMT 0x0  /* management */
  #define        IEEE802_11_AP_LEN               6
  
  #define        T_MGMT 0x0  /* management */
@@ -73,22 +73,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 +172,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_mac48        da;
+       nd_mac48        sa;
+       nd_mac48        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+\
@@ -191,88 +191,87 @@ struct mgmt_header_t {
  #define        CAPABILITY_PRIVACY(cap) ((cap) & 0x0010)
  
  struct ssid_t {
  #define        CAPABILITY_PRIVACY(cap) ((cap) & 0x0010)
  
  struct ssid_t {
-       uint8_t         element_id;
-       uint8_t         length;
+       u_int           length;
         u_char          ssid[33];  /* 32 + 1 for null */
  };
  
  struct rates_t {
         u_char          ssid[33];  /* 32 + 1 for null */
  };
  
  struct rates_t {
-       uint8_t         element_id;
-       uint8_t         length;
+       u_int           length;
         uint8_t         rate[16];
  };
  
  struct challenge_t {
         uint8_t         rate[16];
  };
  
  struct challenge_t {
-       uint8_t         element_id;
-       uint8_t         length;
+       u_int           length;
         uint8_t         text[254]; /* 1-253 + 1 for null */
  };
  
  struct fh_t {
         uint8_t         text[254]; /* 1-253 + 1 for null */
  };
  
  struct fh_t {
-       uint8_t         element_id;
-       uint8_t         length;
+       u_int           length;
         uint16_t        dwell_time;
         uint8_t         hop_set;
         uint16_t        dwell_time;
         uint8_t         hop_set;
-       uint8_t         hop_pattern;
+       uint8_t hop_pattern;
         uint8_t         hop_index;
  };
  
  struct ds_t {
         uint8_t         hop_index;
  };
  
  struct ds_t {
-       uint8_t         element_id;
-       uint8_t         length;
+       u_int           length;
         uint8_t         channel;
  };
  
  struct cf_t {
         uint8_t         channel;
  };
  
  struct cf_t {
-       uint8_t         element_id;
-       uint8_t         length;
+       u_int           length;
         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 {
-       uint8_t         element_id;
-       uint8_t         length;
+       u_int           length;
         uint8_t         count;
         uint8_t         period;
         uint8_t         bitmap_control;
         uint8_t         bitmap[251];
  };
  
         uint8_t         count;
         uint8_t         period;
         uint8_t         bitmap_control;
         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 */
+struct meshid_t {
+       u_int           length;
+       u_char          meshid[33];  /* 32 + 1 for null */
+};
+
+#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_MESHID       114
  
  
  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 +282,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;
@@ -292,14 +291,16 @@ struct mgmt_body_t {
         struct fh_t     fh;
         int             tim_present;
         struct tim_t    tim;
         struct fh_t     fh;
         int             tim_present;
         struct tim_t    tim;
+       int             meshid_present;
+       struct meshid_t meshid;
  };
  
  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_mac48        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 +309,78 @@ 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_mac48        ra;
+       nd_mac48        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_mac48        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_mac48        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_mac48        bssid;
+       nd_mac48        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_mac48        ra;
+       nd_mac48        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_mac48        ra;
+       nd_mac48        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_mac48        ra;
+       nd_mac48        ta;
  };
  
  };
  
-#define        CTRL_BA_HDRLEN  (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+IEEE802_11_RA_LEN)
+#define        CTRL_BA_HDRLEN  (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
+                        IEEE802_11_RA_LEN+IEEE802_11_TA_LEN)
  
  struct ctrl_bar_hdr_t {
  
  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_mac48        ra;
+       nd_mac48        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 +388,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_mac48        addr4;
+       nd_mac48        addr5;
+       nd_mac48        addr6;
  };
  
  #define        IV_IV(iv)       ((iv) & 0xFFFFFF)
  };
  
  #define        IV_IV(iv)       ((iv) & 0xFFFFFF)
@@ -399,31 +402,38 @@ 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) { \
  #define PRINT_RATES(p) \
         if (p.rates_present) { \
-               int z; \
                 const char *sep = " ["; \
                 const char *sep = " ["; \
-               for (z = 0; z < p.rates.length ; z++) { \
-                       PRINT_RATE(sep, p.rates.rate[z], \
-                               (p.rates.rate[z] & 0x80 ? "*" : "")); \
-                       sep = " "; \
+               if (p.rates.length != 0) { \
+                       for (u_int z = 0; z < p.rates.length ; z++) { \
+                               PRINT_RATE(sep, p.rates.rate[z], \
+                                       (p.rates.rate[z] & 0x80 ? "*" : "")); \
+                               sep = " "; \
+                       } \
+                       ND_PRINT(" Mbit]"); \
                 } \
                 } \
-               if (p.rates.length != 0) \
-                       ND_PRINT((ndo, " 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 PRINT_MESHID(p) \
+       if (p.meshid_present) { \
+               ND_PRINT(" (MESHID: "); \
+               fn_print_str(ndo, p.meshid.meshid); \
+               ND_PRINT(")"); \
+       }
  
  #define MAX_MCS_INDEX  76
  
  
  #define MAX_MCS_INDEX  76
  
@@ -438,514 +448,613 @@ 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 */
         "Unspecified failure",                                  /*  1 */
  
  static const char *status_text[] = {
         "Successful",                                           /*  0 */
         "Unspecified failure",                                  /*  1 */
-       "Reserved",                                             /*  2 */
-       "Reserved",                                             /*  3 */
+       "TDLS wakeup schedule rejected but alternative schedule "
+         "provided",                                   /*  2 */
+       "TDLS wakeup schedule rejected",/*  3 */
         "Reserved",                                             /*  4 */
         "Reserved",                                             /*  4 */
-       "Reserved",                                             /*  5 */
-       "Reserved",                                             /*  6 */
-       "Reserved",                                             /*  7 */
+       "Security disabled",                    /*  5 */
+       "Unacceptable lifetime",                /*  6 */
+       "Not in same BSS",                              /*  7 */
         "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 */
         "Reassociation denied due to inability to confirm that association "
           "exists",                                             /* 11 */
-       "Association denied due to reason outside the scope of the "
+       "Association denied due to reason outside the scope of this "
           "standard",                                           /* 12 */
           "standard",                                           /* 12 */
-       "Responding station does not support the specified authentication "
-         "algorithm ",                                         /* 13 */
+       "Responding STA does not support the specified authentication "
+         "algorithm",                                          /* 13 */
         "Received an Authentication frame with authentication transaction "
           "sequence number out of expected sequence",           /* 14 */
         "Authentication rejected because of challenge failure", /* 15 */
         "Authentication rejected due to timeout waiting for next frame in "
         "Received an Authentication frame with authentication transaction "
           "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 */
-       "Association denied because AP is unable to handle additional"
-         "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 "
-         "short preamble operation",                           /* 19 */
-       "Association denied due to requesting station not supporting "
-         "PBCC encoding",                                      /* 20 */
-       "Association denied due to requesting station not supporting "
-         "channel agility",                                    /* 21 */
+         "sequence",                                           /* 16 */
+       "Association denied because AP is unable to handle "
+         "additional associated STAs",                         /* 17 */
+       "Association denied due to requesting STA not supporting "
+         "all of the data rates in the BSSBasicRateSet parameter, "
+         "the Basic HT-MCS Set field of the HT Operation "
+         "parameter, or the Basic VHT-MCS and NSS Set field in "
+         "the VHT Operation parameter",        /* 18 */
+       "Association denied due to requesting STA not supporting "
+         "the short preamble option",                          /* 19 */
+       "Reserved",                                     /* 20 */
+       "Reserved",                                     /* 21 */
         "Association request rejected because Spectrum Management "
           "capability is required",                             /* 22 */
         "Association request rejected because the information in the "
           "Power Capability element is unacceptable",           /* 23 */
         "Association request rejected because the information in the "
           "Supported Channels element is unacceptable",         /* 24 */
         "Association request rejected because Spectrum Management "
           "capability is required",                             /* 22 */
         "Association request rejected because the information in the "
           "Power Capability element is unacceptable",           /* 23 */
         "Association request rejected because the information in the "
           "Supported Channels element is unacceptable",         /* 24 */
-       "Association denied due to requesting station not supporting "
-         "short slot operation",                               /* 25 */
-       "Association denied due to requesting station not supporting "
-         "DSSS-OFDM operation",                                /* 26 */
+       "Association denied due to requesting STA not supporting "
+         "the Short Slot Time option",                         /* 25 */
+       "Reserved",                             /* 26 */
         "Association denied because the requested STA does not support HT "
           "features",                                           /* 27 */
         "Association denied because the requested STA does not support HT "
           "features",                                           /* 27 */
-       "Reserved",                                             /* 28 */
-       "Association denied because the requested STA does not support "
-         "the PCO transition time required by the AP",         /* 29 */
-       "Reserved",                                             /* 30 */
-       "Reserved",                                             /* 31 */
+       "R0KH unreachable",                                     /* 28 */
+       "Association denied because the requesting STA does not "
+         "support the phased coexistence operation (PCO) "
+         "transition time required by the AP",         /* 29 */
+       "Association request rejected temporarily; try again "
+         "later",                                                      /* 30 */
+       "Robust management frame policy violation",     /* 31 */
         "Unspecified, QoS-related failure",                     /* 32 */
         "Unspecified, QoS-related failure",                     /* 32 */
-       "Association denied due to QAP having insufficient bandwidth "
-         "to handle another QSTA",                             /* 33 */
+       "Association denied because QoS AP or PCP has "
+         "insufficient bandwidth to handle another QoS "
+         "STA",                                                                        /* 33 */
         "Association denied due to excessive frame loss rates and/or "
           "poor conditions on current operating channel",       /* 34 */
         "Association denied due to excessive frame loss rates and/or "
           "poor conditions on current operating channel",       /* 34 */
-       "Association (with QBSS) denied due to requesting station not "
-         "supporting the QoS facility",                        /* 35 */
-       "Association denied due to requesting station not supporting "
-         "Block Ack",                                          /* 36 */
+       "Association (with QoS BSS) denied because the requesting STA "
+         "does not support the QoS facility",                  /* 35 */
+       "Reserved",                                                                     /* 36 */
         "The request has been declined",                        /* 37 */
         "The request has not been successful as one or more parameters "
           "have invalid values",                                /* 38 */
         "The request has been declined",                        /* 37 */
         "The request has not been successful as one or more parameters "
           "have invalid values",                                /* 38 */
-       "The TS has not been created because the request cannot be honored. "
-         "Try again with the suggested changes to the TSPEC",  /* 39 */
-       "Invalid Information Element",                          /* 40 */
-       "Group Cipher is not valid",                            /* 41 */
-       "Pairwise Cipher is not valid",                         /* 42 */
-       "AKMP is not valid",                                    /* 43 */
-       "Unsupported RSN IE version",                           /* 44 */
-       "Invalid RSN IE Capabilities",                          /* 45 */
-       "Cipher suite is rejected per security policy",         /* 46 */
-       "The TS has not been created. However, the HC may be capable of "
-         "creating a TS, in response to a request, after the time indicated "
-         "in the TS Delay element",                            /* 47 */
+       "The allocation or TS has not been created because the request "
+         "cannot be honored; however, a suggested TSPEC/DMG TSPEC is "
+         "provided so that the initiating STA can attempt to set "
+         "another allocation or TS with the suggested changes to the "
+         "TSPEC/DMG TSPEC",                                    /* 39 */
+       "Invalid element, i.e., an element defined in this standard "
+         "for which the content does not meet the specifications in "
+         "Clause 9",                                                           /* 40 */
+       "Invalid group cipher",                                         /* 41 */
+       "Invalid pairwise cipher",                                      /* 42 */
+       "Invalid AKMP",                                                         /* 43 */
+       "Unsupported RSNE version",                                     /* 44 */
+       "Invalid RSNE capabilities",                            /* 45 */
+       "Cipher suite rejected because of security policy",             /* 46 */
+       "The TS or allocation has not been created; however, the "
+         "HC or PCP might be capable of creating a TS or "
+         "allocation, in response to a request, after the time "
+         "indicated in the TS Delay element",          /* 47 */
         "Direct Link is not allowed in the BSS by policy",      /* 48 */
         "Direct Link is not allowed in the BSS by policy",      /* 48 */
-       "Destination STA is not present within this QBSS.",     /* 49 */
-       "The Destination STA is not a QSTA.",                   /* 50 */
-
+       "The Destination STA is not present within this BSS",   /* 49 */
+       "The Destination STA is not a QoS STA",         /* 50 */
+
+       "Association denied because the listen interval is "
+         "too large",                                                          /* 51 */
+       "Invalid FT Action frame count",                        /* 52 */
+       "Invalid pairwise master key identifier (PMKID)", /* 53 */
+       "Invalid MDE",                                                          /* 54 */
+       "Invalid FTE",                                                          /* 55 */
+       "Requested TCLAS processing is not supported by the AP "
+         "or PCP",                                                                     /* 56 */
+       "The AP or PCP has insufficient TCLAS processing "
+         "resources to satisfy the request",           /* 57 */
+       "The TS has not been created because the request "
+         "cannot be honored; however, the HC or PCP suggests "
+         "that the STA transition to a different BSS to set up "
+         "the TS",                                                                     /* 58 */
+       "GAS Advertisement Protocol not supported",     /* 59 */
+       "No outstanding GAS request",                           /* 60 */
+       "GAS Response not received from the Advertisement "
+         "Server",                                                                     /* 61 */
+       "STA timed out waiting for GAS Query Response", /* 62 */
+       "LARGE GAS Response is larger than query response "
+         "length limit",                                                       /* 63 */
+       "Request refused because home network does not support "
+         "request",                                                            /* 64 */
+       "Advertisement Server in the network is not currently "
+         "reachable",                                                          /* 65 */
+       "Reserved",                                                                     /* 66 */
+       "Request refused due to permissions received via SSPN "
+         "interface",                                                          /* 67 */
+       "Request refused because the AP or PCP does not "
+         "support unauthenticated access",                     /* 68 */
+       "Reserved",                                                                     /* 69 */
+       "Reserved",                                                                     /* 70 */
+       "Reserved",                                                                     /* 71 */
+       "Invalid contents of RSNE",                             /* 72 */
+       "U-APSD coexistence is not supported",          /* 73 */
+       "Requested U-APSD coexistence mode is not supported", /* 74 */
+       "Requested Interval/Duration value cannot be "
+         "supported with U-APSD coexistence",          /* 75 */
+       "Authentication is rejected because an Anti-Clogging "
+         "Token is required",                                          /* 76 */
+       "Authentication is rejected because the offered "
+         "finite cyclic group is not supported",       /* 77 */
+       "The TBTT adjustment request has not been successful "
+         "because the STA could not find an alternative TBTT", /* 78 */
+       "Transmission failure",                                         /* 79 */
+       "Requested TCLAS Not Supported",                        /* 80 */
+       "TCLAS Resources Exhausted",                            /* 81 */
+       "Rejected with Suggested BSS transition",       /* 82 */
+       "Reject with recommended schedule",                     /* 83 */
+       "Reject because no wakeup schedule specified", /* 84 */
+       "Success, the destination STA is in power save mode", /* 85 */
+       "FST pending, in process of admitting FST session", /* 86 */
+       "Performing FST now",                                           /* 87 */
+       "FST pending, gap(s) in block ack window",      /* 88 */
+       "Reject because of U-PID setting",                      /* 89 */
+       "Reserved",                                                                     /* 90 */
+       "Reserved",                                                                     /* 91 */
+       "(Re)Association refused for some external reason", /* 92 */
+       "(Re)Association refused because of memory limits "
+         "at the AP",                                                          /* 93 */
+       "(Re)Association refused because emergency services "
+         "are not supported at the AP",                        /* 94 */
+       "GAS query response not yet received",          /* 95 */
+       "Reject since the request is for transition to a "
+         "frequency band subject to DSE procedures and "
+         "FST Initiator is a dependent STA",           /* 96 */
+       "Requested TCLAS processing has been terminated by "
+         "the AP",                                                                     /* 97 */
+       "The TS schedule conflicts with an existing "
+         "schedule; an alternative schedule is provided", /* 98 */
+       "The association has been denied; however, one or "
+         "more Multi-band elements are included that can "
+         "be used by the receiving STA to join the BSS", /* 99 */
+       "The request failed due to a reservation conflict", /* 100 */
+       "The request failed due to exceeded MAF limit", /* 101 */
+       "The request failed due to exceeded MCCA track "
+         "limit",                                                                      /* 102 */
+       "Association denied because the information in the"
+         "Spectrum Management field is unacceptable", /* 103 */
+       "Association denied because the requesting STA "
+         "does not support VHT features",                      /* 104 */
+       "Enablement denied",                                            /* 105 */
+       "Enablement denied due to restriction from an "
+         "authorized GDB",                                                     /* 106 */
+       "Authorization deenabled",                                      /* 107 */
  };
  };
-#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 */
-       "Deauthenticated because sending station is leaving (or has left) "
+       "Previous authentication no longer valid",              /* 2 */
+       "Deauthenticated because sending STA is leaving (or has left) "
           "IBSS or ESS",                                        /* 3 */
         "Disassociated due to inactivity",                      /* 4 */
         "Disassociated because AP is unable to handle all currently "
           "IBSS or ESS",                                        /* 3 */
         "Disassociated due to inactivity",                      /* 4 */
         "Disassociated because AP is unable to handle all currently "
-         " associated stations",                               /* 5 */
-       "Class 2 frame received from nonauthenticated station", /* 6 */
-       "Class 3 frame received from nonassociated station",    /* 7 */
-       "Disassociated because sending station is leaving "
+         " associated STAs",                           /* 5 */
+       "Class 2 frame received from nonauthenticated STA", /* 6 */
+       "Class 3 frame received from nonassociated STA",        /* 7 */
+       "Disassociated because sending STA is leaving "
           "(or has left) BSS",                                  /* 8 */
           "(or has left) BSS",                                  /* 8 */
-       "Station requesting (re)association is not authenticated with "
-         "responding station",                                 /* 9 */
+       "STA requesting (re)association is not authenticated with "
+         "responding STA",                                     /* 9 */
         "Disassociated because the information in the Power Capability "
           "element is unacceptable",                            /* 10 */
         "Disassociated because the information in the Power Capability "
           "element is unacceptable",                            /* 10 */
-       "Disassociated because the information in the SupportedChannels "
+       "Disassociated because the information in the Supported Channels "
           "element is unacceptable",                            /* 11 */
           "element is unacceptable",                            /* 11 */
-       "Invalid Information Element",                          /* 12 */
-       "Reserved",                                             /* 13 */
-       "Michael MIC failure",                                  /* 14 */
+       "Disassociated due to BSS transition management",       /* 12 */
+       "Invalid element, i.e., an element defined in this standard for "
+         "which the content does not meet the specifications "
+         "in Clause 9",                                                /* 13 */
+       "Message integrity code (MIC) failure", /* 14 */
         "4-Way Handshake timeout",                              /* 15 */
         "4-Way Handshake timeout",                              /* 15 */
-       "Group key update timeout",                             /* 16 */
+       "Group key handshake timeout",                  /* 16 */
         "Information element in 4-Way Handshake different from (Re)Association"
         "Information element in 4-Way Handshake different from (Re)Association"
-         "Request/Probe Response/Beacon",                      /* 17 */
-       "Group Cipher is not valid",                            /* 18 */
-       "AKMP is not valid",                                    /* 20 */
-       "Unsupported RSN IE version",                           /* 21 */
-       "Invalid RSN IE Capabilities",                          /* 22 */
-       "IEEE 802.1X Authentication failed",                    /* 23 */
-       "Cipher suite is rejected per security policy",         /* 24 */
-       "Reserved",                                             /* 25 */
-       "Reserved",                                             /* 26 */
-       "Reserved",                                             /* 27 */
-       "Reserved",                                             /* 28 */
-       "Reserved",                                             /* 29 */
-       "Reserved",                                             /* 30 */
+         "Request/Probe Response/Beacon frame",        /* 17 */
+       "Invalid group cipher",                                 /* 18 */
+       "Invalid pairwise cipher",                              /* 19 */
+       "Invalid AKMP",                                                 /* 20 */
+       "Unsupported RSNE version",                             /* 21 */
+       "Invalid RSNE capabilities",                            /* 22 */
+       "IEEE 802.1X authentication failed",                    /* 23 */
+       "Cipher suite rejected because of the security policy",         /* 24 */
+       "TDLS direct-link teardown due to TDLS peer STA "
+         "unreachable via the TDLS direct link",                               /* 25 */
+       "TDLS direct-link teardown for unspecified reason",             /* 26 */
+       "Disassociated because session terminated by SSP request",/* 27 */
+       "Disassociated because of lack of SSP roaming agreement",/* 28 */
+       "Requested service rejected because of SSP cipher suite or "
+         "AKM requirement",                                            /* 29 */
+       "Requested service not authorized in this location",    /* 30 */
         "TS deleted because QoS AP lacks sufficient bandwidth for this "
           "QoS STA due to a change in BSS service characteristics or "
           "operational mode (e.g. an HT BSS change from 40 MHz channel "
         "TS deleted because QoS AP lacks sufficient bandwidth for this "
           "QoS STA due to a change in BSS service characteristics or "
           "operational mode (e.g. an HT BSS change from 40 MHz channel "
@@ -954,7 +1063,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 due to 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 */
@@ -971,31 +1080,71 @@ static const char *reason_text[] = {
         "Reserved",                                             /* 43 */
         "Reserved",                                             /* 44 */
         "Peer STA does not support the requested cipher suite", /* 45 */
         "Reserved",                                             /* 43 */
         "Reserved",                                             /* 44 */
         "Peer STA does not support the requested cipher suite", /* 45 */
-       "Association denied due to requesting STA not supporting HT "
-         "features",                                           /* 46 */
+       "In a DLS Teardown frame: The teardown was initiated by the "
+         "DLS peer. In a Disassociation frame: Disassociated because "
+         "authorized access limit reached",                                    /* 46 */
+       "In a DLS Teardown frame: The teardown was initiated by the "
+         "AP. In a Disassociation frame: Disassociated due to external "
+         "service requirements",                                                               /* 47 */
+       "Invalid FT Action frame count",                                                /* 48 */
+       "Invalid pairwise master key identifier (PMKID)",               /* 49 */
+       "Invalid MDE",                                                                                  /* 50 */
+       "Invalid FTE",                                                                                  /* 51 */
+       "Mesh peering canceled for unknown reasons",                    /* 52 */
+       "The mesh STA has reached the supported maximum number of "
+         "peer mesh STAs",                                                                             /* 53 */
+       "The received information violates the Mesh Configuration "
+         "policy configured in the mesh STA profile",                  /* 54 */
+       "The mesh STA has received a Mesh Peering Close frame "
+         "requesting to close the mesh peering",                               /* 55 */
+       "The mesh STA has resent dot11MeshMaxRetries Mesh "
+         "Peering Open frames, without receiving a Mesh Peering "
+         "Confirm frame",                                                                              /* 56 */
+       "The confirmTimer for the mesh peering instance times out",     /* 57 */
+       "The mesh STA fails to unwrap the GTK or the values in the "
+         "wrapped contents do not match",                                              /* 58 */
+       "The mesh STA receives inconsistent information about the "
+         "mesh parameters between mesh peering Management frames",     /* 59 */
+       "The mesh STA fails the authenticated mesh peering exchange "
+         "because due to failure in selecting either the pairwise "
+         "ciphersuite or group ciphersuite",                                   /* 60 */
+       "The mesh STA does not have proxy information for this "
+         "external destination",                                                               /* 61 */
+       "The mesh STA does not have forwarding information for this "
+         "destination",                                                                                /* 62 */
+       "The mesh STA determines that the link to the next hop of an "
+         "active path in its forwarding information is no longer "
+         "usable",                                                                                             /* 63 */
+       "The Deauthentication frame was sent because the MAC "
+         "address of the STA already exists in the mesh BSS",  /* 64 */
+       "The mesh STA performs channel switch to meet regulatory "
+         "requirements",                                                                               /* 65 */
+       "The mesh STA performs channel switching with unspecified "
+         "reason",                                                                                             /* 66 */
  };
  };
-#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;
@@ -1004,6 +1153,7 @@ parse_elements(netdissect_options *ndo,
         struct ds_t ds;
         struct cf_t cf;
         struct tim_t tim;
         struct ds_t ds;
         struct cf_t cf;
         struct tim_t tim;
+       struct meshid_t meshid;
  
         /*
          * We haven't seen any elements yet.
  
         /*
          * We haven't seen any elements yet.
@@ -1014,33 +1164,28 @@ parse_elements(netdissect_options *ndo,
         pbody->ds_present = 0;
         pbody->cf_present = 0;
         pbody->tim_present = 0;
         pbody->ds_present = 0;
         pbody->cf_present = 0;
         pbody->tim_present = 0;
+       pbody->meshid_present = 0;
  
         while (length != 0) {
                 /* Make sure we at least have the element ID and length. */
  
         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:
                 case E_SSID:
-                       memcpy(&ssid, p + offset, 2);
+                       ssid.length = elementlen;
                         offset += 2;
                         length -= 2;
                         if (ssid.length != 0) {
                                 if (ssid.length > sizeof(ssid.ssid) - 1)
                                         return 0;
                         offset += 2;
                         length -= 2;
                         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;
@@ -1059,17 +1204,13 @@ parse_elements(netdissect_options *ndo,
                         }
                         break;
                 case E_CHALLENGE:
                         }
                         break;
                 case E_CHALLENGE:
-                       memcpy(&challenge, p + offset, 2);
+                       challenge.length = elementlen;
                         offset += 2;
                         length -= 2;
                         if (challenge.length != 0) {
                                 if (challenge.length >
                                     sizeof(challenge.text) - 1)
                                         return 0;
                         offset += 2;
                         length -= 2;
                         if (challenge.length != 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;
@@ -1089,15 +1230,11 @@ parse_elements(netdissect_options *ndo,
                         }
                         break;
                 case E_RATES:
                         }
                         break;
                 case E_RATES:
-                       memcpy(&rates, p + offset, 2);
+                       rates.length = elementlen;
                         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;
@@ -1125,7 +1262,7 @@ parse_elements(netdissect_options *ndo,
                         }
                         break;
                 case E_DS:
                         }
                         break;
                 case E_DS:
-                       memcpy(&ds, p + offset, 2);
+                       ds.length = elementlen;
                         offset += 2;
                         length -= 2;
                         if (ds.length != 1) {
                         offset += 2;
                         length -= 2;
                         if (ds.length != 1) {
@@ -1133,7 +1270,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;
                         /*
@@ -1149,7 +1286,7 @@ parse_elements(netdissect_options *ndo,
                         }
                         break;
                 case E_CF:
                         }
                         break;
                 case E_CF:
-                       memcpy(&cf, p + offset, 2);
+                       cf.length = elementlen;
                         offset += 2;
                         length -= 2;
                         if (cf.length != 6) {
                         offset += 2;
                         length -= 2;
                         if (cf.length != 6) {
@@ -1157,9 +1294,18 @@ parse_elements(netdissect_options *ndo,
                                 length -= cf.length;
                                 break;
                         }
                                 length -= cf.length;
                                 break;
                         }
-                       memcpy(&cf.count, p + offset, 6);
-                       offset += 6;
-                       length -= 6;
+                       cf.count = GET_U_1(p + offset);
+                       offset += 1;
+                       length -= 1;
+                       cf.period = GET_U_1(p + offset);
+                       offset += 1;
+                       length -= 1;
+                       cf.max_duration = GET_LE_U_2(p + offset);
+                       offset += 2;
+                       length -= 2;
+                       cf.dur_remaining = GET_LE_U_2(p + offset);
+                       offset += 2;
+                       length -= 2;
                         /*
                          * Present and not truncated.
                          *
                         /*
                          * Present and not truncated.
                          *
@@ -1173,22 +1319,26 @@ parse_elements(netdissect_options *ndo,
                         }
                         break;
                 case E_TIM:
                         }
                         break;
                 case E_TIM:
-                       memcpy(&tim, p + offset, 2);
+                       tim.length = elementlen;
                         offset += 2;
                         length -= 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;
                                 return 0;
-                       memcpy(&tim.count, p + offset, 3);
-                       offset += 3;
-                       length -= 3;
-
-                       memcpy(tim.bitmap, p + (tim.length - 3),
-                           (tim.length - 3));
+                       tim.count = GET_U_1(p + offset);
+                       offset += 1;
+                       length -= 1;
+                       tim.period = GET_U_1(p + offset);
+                       offset += 1;
+                       length -= 1;
+                       tim.bitmap_control = GET_U_1(p + offset);
+                       offset += 1;
+                       length -= 1;
+                       memcpy(tim.bitmap, p + offset, tim.length - 3);
                         offset += tim.length - 3;
                         length -= tim.length - 3;
                         /*
                         offset += tim.length - 3;
                         length -= tim.length - 3;
                         /*
@@ -1203,10 +1353,34 @@ parse_elements(netdissect_options *ndo,
                                 pbody->tim_present = 1;
                         }
                         break;
                                 pbody->tim_present = 1;
                         }
                         break;
+               case E_MESHID:
+                       meshid.length = elementlen;
+                       offset += 2;
+                       length -= 2;
+                       if (meshid.length != 0) {
+                               if (meshid.length > sizeof(meshid.meshid) - 1)
+                                       return 0;
+                               memcpy(&meshid.meshid, p + offset, meshid.length);
+                               offset += meshid.length;
+                               length -= meshid.length;
+                       }
+                       meshid.meshid[meshid.length] = '\0';
+                       /*
+                        * Present and not truncated.
+                        *
+                        * If we haven't already seen a MESHID IE,
+                        * copy this one, otherwise ignore this one,
+                        * so we later report the first one we saw.
+                        */
+                       if (!pbody->meshid_present) {
+                               pbody->meshid = meshid;
+                               pbody->meshid_present = 1;
+                       }
+                       break;
                 default:
  #if 0
                 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 +1390,8 @@ parse_elements(netdissect_options *ndo,
  
         /* No problems found. */
         return 1;
  
         /* No problems found. */
         return 1;
+trunc:
+       return 0;
  }
  
  /*********************************************************************************
  }
  
  /*********************************************************************************
@@ -1224,7 +1400,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 +1408,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 +1427,19 @@ 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);
         PRINT_DS_CHANNEL(pbody);
+       PRINT_MESHID(pbody);
  
         return ret;
  
         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 +1447,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 +1462,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 +1476,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 +1514,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 +1532,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", mac48_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 +1567,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 +1575,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;
  
@@ -1415,8 +1595,11 @@ handle_probe_response(netdissect_options *ndo,
         PRINT_SSID(pbody);
         PRINT_RATES(pbody);
         PRINT_DS_CHANNEL(pbody);
         PRINT_SSID(pbody);
         PRINT_RATES(pbody);
         PRINT_DS_CHANNEL(pbody);
+       PRINT_MESHID(pbody);
  
         return ret;
  
         return ret;
+trunc:
+       return 0;
  }
  
  static int
  }
  
  static int
@@ -1428,29 +1611,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 +1642,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 +1660,153 @@ 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", GET_MAC48_STRING(src), reason);
         }
         return 1;
         }
         return 1;
+trunc:
+       return 0;
  }
  
  }
  
-#define        PRINT_HT_ACTION(v) (\
-       (v) == 0 ? ND_PRINT((ndo, "TxChWidth")) : \
-       (v) == 1 ? ND_PRINT((ndo, "MIMOPwrSave")) : \
-                  ND_PRINT((ndo, "Act#%d", (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))) \
-)
-#define        PRINT_MESHLINK_ACTION(v) (\
-       (v) == 0 ? ND_PRINT((ndo, "Request")) : \
-       (v) == 1 ? ND_PRINT((ndo, "Report")) : \
-                  ND_PRINT((ndo, "Act#%d", (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))) \
-)
-#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))) \
-)
-
-#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))) \
-)
-#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))) \
-)
-#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))) \
-)
+static const struct tok category_str[] = {
+       { 0,   "Spectrum Management" },
+       { 1,   "QoS"                 },
+       { 2,   "DLS"                 },
+       { 3,   "BA"                  },
+       { 7,   "HT"                  },
+       { 13,  "MeshAction"          },
+       { 14,  "MultihopAction"      },
+       { 15,  "SelfprotectAction"   },
+       { 127, "Vendor"              },
+       { 0, NULL }
+};
+
+static const struct tok act_ba_str[] = {
+       { 0, "ADDBA Request"  },
+       { 1, "ADDBA Response" },
+       { 2, "DELBA"          },
+       { 0, NULL }
+};
+
+static const struct tok act_ht_str[] = {
+       { 0, "TxChWidth"   },
+       { 1, "MIMOPwrSave" },
+       { 0, NULL }
+};
+
+static const struct tok act_mesh_str[] = {
+       { 0,  "MeshLink"                   },
+       { 1,  "HWMP"                       },
+       { 2,  "Gate Announcement"          },
+       { 3,  "Congestion Control"         },
+       { 4,  "MCCA Setup Request"         },
+       { 5,  "MCCA Setup Reply"           },
+       { 6,  "MCCA Advertisement Request" },
+       { 7,  "MCCA Advertisement"         },
+       { 8,  "MCCA Teardown"              },
+       { 9,  "TBTT Adjustment Request"    },
+       { 10, "TBTT Adjustment Response"   },
+       { 0, NULL }
+};
+
+static const struct tok act_mhop_str[] = {
+       { 0, "Proxy Update" },
+       { 1, "Proxy Update Confirmation" },
+       { 0, NULL }
+};
+
+static const struct tok act_selfpr_str[] = {
+       { 1, "Peering Open"          },
+       { 2, "Peering Confirm"       },
+       { 3, "Peering Close"         },
+       { 4, "Group Key Inform"      },
+       { 5, "Group Key Acknowledge" },
+       { 0, NULL }
+};
+
+static const struct uint_tokary category2tokary[] = {
+       { 3,   act_ba_str     },
+       { 7,   act_ht_str     },
+       { 13,  act_mesh_str   },
+       { 14,  act_mhop_str   },
+       { 15,  act_selfpr_str },
+       /* uint2tokary() does not use array termination. */
+};
  
  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;
+       uint8_t category, action;
+       const struct tok *action_str;
+
+       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)));
-       }
-       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;
-       case 14:
-               ND_PRINT((ndo, "MultiohopAction "));
-               PRINT_MULTIHOP_ACTION(p[1]); break;
-       case 15:
-               ND_PRINT((ndo, "SelfprotectAction "));
-               PRINT_SELFPROT_ACTION(p[1]); break;
-       case 127: ND_PRINT((ndo, "Vendor Act#%d", p[1])); break;
-       default:
-               ND_PRINT((ndo, "Reserved(%d) Act#%d", p[0], p[1]));
-               break;
+               ND_PRINT(" (%s): ", GET_MAC48_STRING(src));
         }
         }
+       category = GET_U_1(p);
+       ND_PRINT("%s ", tok2str(category_str, "Reserved(%u)", category));
+       action = GET_U_1(p + 1);
+       action_str = uint2tokary(category2tokary, category);
+       if (!action_str)
+               ND_PRINT("Act#%u", action);
+       else
+               ND_PRINT("%s", tok2str(action_str, "Act#%u", action));
+
         return 1;
         return 1;
+trunc:
+       return 0;
  }
  
  
  }
  
  
@@ -1629,9 +1817,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 +1861,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) ",
-                           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))));
+                       ND_PRINT(" RA:%s TA:%s CTL(%x) SEQ(%u) ",
+                           GET_MAC48_STRING(((const struct ctrl_bar_hdr_t *)p)->ra),
+                           GET_MAC48_STRING(((const struct ctrl_bar_hdr_t *)p)->ta),
+                           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 ",
+                           GET_MAC48_STRING(((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 ",
+                           GET_MAC48_STRING(((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 ",
+                           GET_MAC48_STRING(((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 ",
+                           GET_MAC48_STRING(((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 ",
+                           GET_MAC48_STRING(((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 ",
+                           GET_MAC48_STRING(((const struct ctrl_end_ack_hdr_t *)p)->ra));
                 break;
         }
         return 1;
                 break;
         }
         return 1;
+trunc:
+       return 0;
  }
  
  /*
  }
  
  /*
@@ -1757,7 +1939,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)
@@ -1776,7 +1958,7 @@ get_data_src_dst_mac(uint16_t fc, const u_char *p, const uint8_t **srcp,
                 }
         } else {
                 if (!FC_FROM_DS(fc)) {
                 }
         } else {
                 if (!FC_FROM_DS(fc)) {
-                       /* From DS and not To DS */
+                       /* To DS and not From DS */
                         *srcp = ADDR2;
                         *dstp = ADDR3;
                 } else {
                         *srcp = ADDR2;
                         *dstp = ADDR3;
                 } else {
@@ -1814,19 +1996,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 +2017,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 ",
-                   etheraddr_string(ndo, ADDR1), etheraddr_string(ndo, ADDR2),
-                   etheraddr_string(ndo, ADDR3)));
+               ND_PRINT("DA:%s SA:%s BSSID:%s ",
+                   GET_MAC48_STRING(ADDR1), GET_MAC48_STRING(ADDR2),
+                   GET_MAC48_STRING(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 ",
-                   etheraddr_string(ndo, ADDR1), etheraddr_string(ndo, ADDR2),
-                   etheraddr_string(ndo, ADDR3)));
+               ND_PRINT("DA:%s BSSID:%s SA:%s ",
+                   GET_MAC48_STRING(ADDR1), GET_MAC48_STRING(ADDR2),
+                   GET_MAC48_STRING(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 ",
-                   etheraddr_string(ndo, ADDR1), etheraddr_string(ndo, ADDR2),
-                   etheraddr_string(ndo, ADDR3)));
+               ND_PRINT("BSSID:%s SA:%s DA:%s ",
+                   GET_MAC48_STRING(ADDR1), GET_MAC48_STRING(ADDR2),
+                   GET_MAC48_STRING(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 ",
-                   etheraddr_string(ndo, ADDR1), etheraddr_string(ndo, ADDR2),
-                   etheraddr_string(ndo, ADDR3), etheraddr_string(ndo, ADDR4)));
+               ND_PRINT("RA:%s TA:%s DA:%s SA:%s ",
+                   GET_MAC48_STRING(ADDR1), GET_MAC48_STRING(ADDR2),
+                   GET_MAC48_STRING(ADDR3), GET_MAC48_STRING(ADDR4));
         }
  
  #undef ADDR1
         }
  
  #undef ADDR1
@@ -1863,9 +2045,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 ",
-           etheraddr_string(ndo, (hp)->bssid), etheraddr_string(ndo, (hp)->da),
-           etheraddr_string(ndo, (hp)->sa)));
+       ND_PRINT("BSSID:%s DA:%s SA:%s ",
+           GET_MAC48_STRING((hp)->bssid), GET_MAC48_STRING((hp)->da),
+           GET_MAC48_STRING((hp)->sa));
  }
  
  static void
  }
  
  static void
@@ -1873,43 +2055,44 @@ 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) ",
-                   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))));
+               ND_PRINT(" RA:%s TA:%s CTL(%x) SEQ(%u) ",
+                   GET_MAC48_STRING(((const struct ctrl_bar_hdr_t *)p)->ra),
+                   GET_MAC48_STRING(((const struct ctrl_bar_hdr_t *)p)->ta),
+                   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 TA:%s ",
+                   GET_MAC48_STRING(((const struct ctrl_ba_hdr_t *)p)->ra),
+                   GET_MAC48_STRING(((const struct ctrl_ba_hdr_t *)p)->ta));
                 break;
         case CTRL_PS_POLL:
                 break;
         case CTRL_PS_POLL:
-               ND_PRINT((ndo, "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)->ta)));
+               ND_PRINT("BSSID:%s TA:%s ",
+                   GET_MAC48_STRING(((const struct ctrl_ps_poll_hdr_t *)p)->bssid),
+                   GET_MAC48_STRING(((const struct ctrl_ps_poll_hdr_t *)p)->ta));
                 break;
         case CTRL_RTS:
                 break;
         case CTRL_RTS:
-               ND_PRINT((ndo, "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)->ta)));
+               ND_PRINT("RA:%s TA:%s ",
+                   GET_MAC48_STRING(((const struct ctrl_rts_hdr_t *)p)->ra),
+                   GET_MAC48_STRING(((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 ",
+                   GET_MAC48_STRING(((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 ",
+                   GET_MAC48_STRING(((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 ",
-                   etheraddr_string(ndo, ((const struct ctrl_end_hdr_t *)p)->ra),
-                   etheraddr_string(ndo, ((const struct ctrl_end_hdr_t *)p)->bssid)));
+               ND_PRINT("RA:%s BSSID:%s ",
+                   GET_MAC48_STRING(((const struct ctrl_end_hdr_t *)p)->ra),
+                   GET_MAC48_STRING(((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 ",
-                   etheraddr_string(ndo, ((const struct ctrl_end_ack_hdr_t *)p)->ra),
-                   etheraddr_string(ndo, ((const struct ctrl_end_ack_hdr_t *)p)->bssid)));
+               ND_PRINT("RA:%s BSSID:%s ",
+                   GET_MAC48_STRING(((const struct ctrl_end_ack_hdr_t *)p)->ra),
+                   GET_MAC48_STRING(((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 +2102,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 +2130,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 +2139,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 +2155,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", GET_MAC48_STRING(mc->addr4));
                 if (ae > 1)
                 if (ae > 1)
-                       ND_PRINT((ndo, " A5:%s", etheraddr_string(ndo, mc->addr5)));
+                       ND_PRINT(" A5:%s", GET_MAC48_STRING(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", GET_MAC48_STRING(mc->addr6));
+               ND_PRINT(") ");
         }
  
         switch (FC_TYPE(fc)) {
         }
  
         switch (FC_TYPE(fc)) {
@@ -2024,26 +2206,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 +2232,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 +2246,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 +2270,19 @@ ieee802_11_print(netdissect_options *ndo,
         caplen -= hdrlen;
         p += hdrlen;
  
         caplen -= hdrlen;
         p += hdrlen;
  
+       src.addr_string = mac48_string;
+       dst.addr_string = mac48_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 +2291,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
@@ -2142,11 +2325,12 @@ ieee802_11_print(netdissect_options *ndo,
   * 'h->len' is the length of the packet off the wire, and 'h->caplen'
   * is the number of bytes actually captured.
   */
   * 'h->len' is the length of the packet off the wire, and 'h->caplen'
   * is the number of bytes actually captured.
   */
-u_int
+void
  ieee802_11_if_print(netdissect_options *ndo,
  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)
  {
  {
-       return ieee802_11_print(ndo, p, h->len, h->caplen, 0, 0);
+       ndo->ndo_protocol = "802.11";
+       ndo->ndo_ll_hdr_len += ieee802_11_print(ndo, p, h->len, h->caplen, 0, 0);
  }
  
  
  }
  
  
@@ -2203,18 +2387,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 +2433,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 +2474,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 +2495,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,9 +2506,9 @@ 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
   *
   *     Bitset indicating which fields have known values, followed
   *     by bitset of flag values, followed by the MCS rate index as
@@ -2341,8 +2525,8 @@ struct ieee80211_radiotap_header {
   *
   * 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
@@ -2395,15 +2579,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 */
@@ -2492,16 +2676,6 @@ enum ieee80211_radiotap_type {
  
  #define IEEE80211_RADIOTAP_CODING_LDPC_USERn                   0x01
  
  
  #define IEEE80211_RADIOTAP_CODING_LDPC_USERn                   0x01
  
-
-/* Radiotap state */
-/*  This is used to save state when parsing/processing parameters */
-struct radiotap_state
-{
-       uint32_t        present;
-
-       uint8_t         rate;
-};
-
  #define        IEEE80211_CHAN_FHSS \
         (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_GFSK)
  #define        IEEE80211_CHAN_A \
  #define        IEEE80211_CHAN_FHSS \
         (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_GFSK)
  #define        IEEE80211_CHAN_A \
@@ -2528,234 +2702,100 @@ struct radiotap_state
  
  static void
  print_chaninfo(netdissect_options *ndo,
  
  static void
  print_chaninfo(netdissect_options *ndo,
-               int freq, int flags, int presentflags)
+              uint16_t freq, uint32_t flags, uint32_t presentflags)
  {
  {
-       ND_PRINT((ndo, "%u MHz", freq));
+       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.
                  */
         if (presentflags & (1 << IEEE80211_RADIOTAP_MCS)) {
                 /*
                  * We have the MCS field, so this is 11n, regardless
                  * of what the channel flags say.
                  */
-               ND_PRINT((ndo, " 11n"));
+               ND_PRINT(" 11n");
         } else {
                 if (IS_CHAN_FHSS(flags))
         } else {
                 if (IS_CHAN_FHSS(flags))
-                       ND_PRINT((ndo, " FHSS"));
+                       ND_PRINT(" FHSS");
                 if (IS_CHAN_A(flags)) {
                         if (flags & IEEE80211_CHAN_HALF)
                 if (IS_CHAN_A(flags)) {
                         if (flags & IEEE80211_CHAN_HALF)
-                               ND_PRINT((ndo, " 11a/10Mhz"));
+                               ND_PRINT(" 11a/10Mhz");
                         else if (flags & IEEE80211_CHAN_QUARTER)
                         else if (flags & IEEE80211_CHAN_QUARTER)
-                               ND_PRINT((ndo, " 11a/5Mhz"));
+                               ND_PRINT(" 11a/5Mhz");
                         else
                         else
-                               ND_PRINT((ndo, " 11a"));
+                               ND_PRINT(" 11a");
                 }
                 if (IS_CHAN_ANYG(flags)) {
                         if (flags & IEEE80211_CHAN_HALF)
                 }
                 if (IS_CHAN_ANYG(flags)) {
                         if (flags & IEEE80211_CHAN_HALF)
-                               ND_PRINT((ndo, " 11g/10Mhz"));
+                               ND_PRINT(" 11g/10Mhz");
                         else if (flags & IEEE80211_CHAN_QUARTER)
                         else if (flags & IEEE80211_CHAN_QUARTER)
-                               ND_PRINT((ndo, " 11g/5Mhz"));
+                               ND_PRINT(" 11g/5Mhz");
                         else
                         else
-                               ND_PRINT((ndo, " 11g"));
+                               ND_PRINT(" 11g");
                 } else if (IS_CHAN_B(flags))
                 } else if (IS_CHAN_B(flags))
-                       ND_PRINT((ndo, " 11b"));
+                       ND_PRINT(" 11b");
                 if (flags & IEEE80211_CHAN_TURBO)
                 if (flags & IEEE80211_CHAN_TURBO)
-                       ND_PRINT((ndo, " Turbo"));
+                       ND_PRINT(" Turbo");
         }
         /*
          * These apply to 11n.
          */
         if (flags & IEEE80211_CHAN_HT20)
         }
         /*
          * These apply to 11n.
          */
         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, u5, u6;
-       uint8_t mcs_nss[4];
         u_int i;
         int rc;
  
         switch (bit) {
         u_int i;
         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);
-               if (rc != 0)
-                       break;
-               rc = cpack_uint8(s, &u3.u8);
-               break;
-       case IEEE80211_RADIOTAP_AMPDU_STATUS:
-               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);
+       case IEEE80211_RADIOTAP_TSFT: {
+               uint64_t tsft;
+
+               rc = nd_cpack_uint64(ndo, s, &tsft);
                 if (rc != 0)
                 if (rc != 0)
-                       break;
-               rc = cpack_uint8(s, &u4.u8);
+                       goto trunc;
+               ND_PRINT("%" PRIu64 "us tsft ", tsft);
                 break;
                 break;
-       case IEEE80211_RADIOTAP_VHT:
-               rc = cpack_uint16(s, &u.u16);
-               if (rc != 0)
-                       break;
-               rc = cpack_uint8(s, &u2.u8);
-               if (rc != 0)
-                       break;
-               rc = cpack_uint8(s, &u3.u8);
-               if (rc != 0)
-                       goto fail;
-               for (i = 0; i < 4; i++) {
-                       rc = cpack_uint8(s, &mcs_nss[i]);
-                       if (rc != 0)
-                               goto fail;
                 }
                 }
-               rc = cpack_uint8(s, &u4.u8);
-               if (rc != 0)
-                       break;
-               rc = cpack_uint8(s, &u5.u8);
-               if (rc != 0)
-                       goto fail;
-               rc = cpack_uint16(s, &u6.u16);
-       fail:
-               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;
-               }
+       case IEEE80211_RADIOTAP_FLAGS: {
+               uint8_t flagsval;
  
  
-               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);
+               rc = nd_cpack_uint8(ndo, s, &flagsval);
                 if (rc != 0)
                 if (rc != 0)
-                       break;
-
-               /* Skip up to length */
-               s->c_next += length;
+                       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, presentflags);
-               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 = nd_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
@@ -2773,7 +2813,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
@@ -2790,59 +2830,172 @@ 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 = nd_cpack_uint16(ndo, s, &frequency);
+               if (rc != 0)
+                       goto trunc;
+               rc = nd_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 = nd_cpack_uint8(ndo, s, &hopset);
+               if (rc != 0)
+                       goto trunc;
+               rc = nd_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 = nd_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 = nd_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 = nd_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 = nd_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 = nd_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 = nd_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 = nd_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 = nd_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 = nd_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 = nd_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, presentflags);
+               }
+
+       case IEEE80211_RADIOTAP_XCHANNEL: {
+               uint32_t flags;
+               uint16_t frequency;
+               uint8_t channel;
+               uint8_t maxpower;
+
+               rc = nd_cpack_uint32(ndo, s, &flags);
+               if (rc != 0)
+                       goto trunc;
+               rc = nd_cpack_uint16(ndo, s, &frequency);
+               if (rc != 0)
+                       goto trunc;
+               rc = nd_cpack_uint8(ndo, s, &channel);
+               if (rc != 0)
+                       goto trunc;
+               rc = nd_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: {
+               uint8_t known;
+               uint8_t flags;
+               uint8_t mcs_index;
                 static const char *ht_bandwidth[4] = {
                         "20 MHz",
                         "40 MHz",
                 static const char *ht_bandwidth[4] = {
                         "20 MHz",
                         "40 MHz",
@@ -2851,25 +3004,34 @@ print_radiotap_field(netdissect_options *ndo,
                 };
                 float htrate;
  
                 };
                 float htrate;
  
-               if (u.u8 & IEEE80211_RADIOTAP_MCS_MCS_INDEX_KNOWN) {
+               rc = nd_cpack_uint8(ndo, s, &known);
+               if (rc != 0)
+                       goto trunc;
+               rc = nd_cpack_uint8(ndo, s, &flags);
+               if (rc != 0)
+                       goto trunc;
+               rc = nd_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
@@ -2889,44 +3051,71 @@ 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 ",
-                               ht_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 (u.u8 & IEEE80211_RADIOTAP_MCS_GUARD_INTERVAL_KNOWN) {
-                       ND_PRINT((ndo, "%s GI ",
-                               (u2.u8 & IEEE80211_RADIOTAP_MCS_SHORT_GI) ?
-                               "short" : "long"));
+               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_HT_FORMAT_KNOWN) {
-                       ND_PRINT((ndo, "%s ",
-                               (u2.u8 & IEEE80211_RADIOTAP_MCS_HT_GREENFIELD) ?
-                               "greenfield" : "mixed"));
+               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_FEC_TYPE_KNOWN) {
-                       ND_PRINT((ndo, "%s FEC ",
-                               (u2.u8 & IEEE80211_RADIOTAP_MCS_FEC_LDPC) ?
-                               "LDPC" : "BCC"));
+               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_STBC_KNOWN) {
-                       ND_PRINT((ndo, "RX-STBC%u ",
-                               (u2.u8 & IEEE80211_RADIOTAP_MCS_STBC_MASK) >> IEEE80211_RADIOTAP_MCS_STBC_SHIFT));
+               if (known & IEEE80211_RADIOTAP_MCS_STBC_KNOWN) {
+                       ND_PRINT("RX-STBC%u ",
+                               (flags & IEEE80211_RADIOTAP_MCS_STBC_MASK) >> IEEE80211_RADIOTAP_MCS_STBC_SHIFT);
                 }
                 }
-
                 break;
                 }
                 break;
                 }
-       case IEEE80211_RADIOTAP_AMPDU_STATUS:
+
+       case IEEE80211_RADIOTAP_AMPDU_STATUS: {
+               uint32_t reference_num;
+               uint16_t flags;
+               uint8_t delim_crc;
+               uint8_t reserved;
+
+               rc = nd_cpack_uint32(ndo, s, &reference_num);
+               if (rc != 0)
+                       goto trunc;
+               rc = nd_cpack_uint16(ndo, s, &flags);
+               if (rc != 0)
+                       goto trunc;
+               rc = nd_cpack_uint8(ndo, s, &delim_crc);
+               if (rc != 0)
+                       goto trunc;
+               rc = nd_cpack_uint8(ndo, s, &reserved);
+               if (rc != 0)
+                       goto trunc;
+               /* Do nothing for now */
                 break;
                 break;
+               }
+
         case IEEE80211_RADIOTAP_VHT: {
         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",
                 static const char *vht_bandwidth[32] = {
                         "20 MHz",
                         "40 MHz",
@@ -2962,6 +3151,29 @@ print_radiotap_field(netdissect_options *ndo,
                         "unknown (31)"
                 };
  
                         "unknown (31)"
                 };
  
+               rc = nd_cpack_uint16(ndo, s, &known);
+               if (rc != 0)
+                       goto trunc;
+               rc = nd_cpack_uint8(ndo, s, &flags);
+               if (rc != 0)
+                       goto trunc;
+               rc = nd_cpack_uint8(ndo, s, &bandwidth);
+               if (rc != 0)
+                       goto trunc;
+               for (i = 0; i < 4; i++) {
+                       rc = nd_cpack_uint8(ndo, s, &mcs_nss[i]);
+                       if (rc != 0)
+                               goto trunc;
+               }
+               rc = nd_cpack_uint8(ndo, s, &coding);
+               if (rc != 0)
+                       goto trunc;
+               rc = nd_cpack_uint8(ndo, s, &group_id);
+               if (rc != 0)
+                       goto trunc;
+               rc = nd_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;
                 for (i = 0; i < 4; i++) {
                         u_int nss, mcs;
                         nss = mcs_nss[i] & IEEE80211_RADIOTAP_VHT_NSS_MASK;
@@ -2970,107 +3182,277 @@ print_radiotap_field(netdissect_options *ndo,
                         if (nss == 0)
                                 continue;
  
                         if (nss == 0)
                                 continue;
  
-                       ND_PRINT((ndo, "User %u MCS %u ", i, mcs));
-                       ND_PRINT((ndo, "%s FEC ",
-                               (u4.u8 & (IEEE80211_RADIOTAP_CODING_LDPC_USERn << i)) ?
-                               "LDPC" : "BCC"));
+                       ND_PRINT("User %u MCS %u ", i, mcs);
+                       ND_PRINT("%s FEC ",
+                               (coding & (IEEE80211_RADIOTAP_CODING_LDPC_USERn << i)) ?
+                               "LDPC" : "BCC");
                 }
                 }
-               if (u.u16 & IEEE80211_RADIOTAP_VHT_BANDWIDTH_KNOWN) {
-                       ND_PRINT((ndo, "%s ",
-                               vht_bandwidth[u3.u8 & IEEE80211_RADIOTAP_VHT_BANDWIDTH_MASK]));
+               if (known & IEEE80211_RADIOTAP_VHT_BANDWIDTH_KNOWN) {
+                       ND_PRINT("%s ",
+                               vht_bandwidth[bandwidth & IEEE80211_RADIOTAP_VHT_BANDWIDTH_MASK]);
                 }
                 }
-               if (u.u16 & IEEE80211_RADIOTAP_VHT_GUARD_INTERVAL_KNOWN) {
-                       ND_PRINT((ndo, "%s GI ",
-                               (u2.u8 & IEEE80211_RADIOTAP_VHT_SHORT_GI) ?
-                               "short" : "long"));
+               if (known & IEEE80211_RADIOTAP_VHT_GUARD_INTERVAL_KNOWN) {
+                       ND_PRINT("%s GI ",
+                               (flags & IEEE80211_RADIOTAP_VHT_SHORT_GI) ?
+                               "short" : "long");
                 }
                 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("[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;
         }
                 return caplen;
         }
-       cpack_init(&cpacker, (const uint8_t *)hdr, len); /* align against header start */
-       cpack_advance(&cpacker, sizeof(*hdr)); /* includes the 1st bitmap */
+       nd_cpack_init(&cpacker, (const uint8_t *)hdr, len); /* align against header start */
+       nd_cpack_advance(&cpacker, sizeof(*hdr)); /* includes the 1st bitmap */
         for (last_presentp = &hdr->it_present;
         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++)
              last_presentp++)
-         cpack_advance(&cpacker, sizeof(hdr->it_present)); /* more bitmaps */
+         nd_cpack_advance(&cpacker, sizeof(hdr->it_present)); /* more bitmaps */
  
         /* are there more bitmap extensions than bytes in header? */
  
         /* 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 (nd_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 ((nd_cpack_align_and_reserve(&cpacker, 2)) == NULL) {
+                               nd_print_trunc(ndo);
+                               break;
+                       }
+                       if (nd_cpack_uint8(ndo, &cpacker, &vendor_oui[0]) != 0) {
+                               nd_print_trunc(ndo);
+                               break;
+                       }
+                       if (nd_cpack_uint8(ndo, &cpacker, &vendor_oui[1]) != 0) {
+                               nd_print_trunc(ndo);
+                               break;
+                       }
+                       if (nd_cpack_uint8(ndo, &cpacker, &vendor_oui[2]) != 0) {
+                               nd_print_trunc(ndo);
+                               break;
+                       }
+                       if (nd_cpack_uint8(ndo, &cpacker, &vendor_subnamespace) != 0) {
+                               nd_print_trunc(ndo);
+                               break;
+                       }
+                       if (nd_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)
@@ -3086,29 +3468,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;
         }
  
@@ -3135,42 +3518,51 @@ ieee802_11_avs_radio_print(netdissect_options *ndo,
   * the AVS header, and the first 4 bytes of the header are used to
   * indicate whether it's a Prism header or an AVS header).
   */
   * the AVS header, and the first 4 bytes of the header are used to
   * indicate whether it's a Prism header or an AVS header).
   */
-u_int
+void
  prism_if_print(netdissect_options *ndo,
  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 (caplen < 4) {
         if (caplen < 4) {
-               ND_PRINT((ndo, "%s", tstr));
-               return caplen;
+               nd_print_trunc(ndo);
+               ndo->ndo_ll_hdr_len += caplen;
+               return;
         }
  
         }
  
-       msgcode = EXTRACT_32BITS(p);
+       msgcode = GET_BE_U_4(p);
         if (msgcode == WLANCAP_MAGIC_COOKIE_V1 ||
         if (msgcode == WLANCAP_MAGIC_COOKIE_V1 ||
-           msgcode == WLANCAP_MAGIC_COOKIE_V2)
-               return ieee802_11_avs_radio_print(ndo, p, length, caplen);
+           msgcode == WLANCAP_MAGIC_COOKIE_V2) {
+               ndo->ndo_ll_hdr_len += ieee802_11_radio_avs_print(ndo, p, length, caplen);
+               return;
+       }
  
         if (caplen < PRISM_HDR_LEN) {
  
         if (caplen < PRISM_HDR_LEN) {
-               ND_PRINT((ndo, "%s", tstr));
-               return caplen;
+               nd_print_trunc(ndo);
+               ndo->ndo_ll_hdr_len += caplen;
+               return;
         }
  
         }
  
-       return PRISM_HDR_LEN + ieee802_11_print(ndo, p + PRISM_HDR_LEN,
-           length - PRISM_HDR_LEN, caplen - PRISM_HDR_LEN, 0, 0);
+       p += PRISM_HDR_LEN;
+       length -= PRISM_HDR_LEN;
+       caplen -= PRISM_HDR_LEN;
+       ndo->ndo_ll_hdr_len += PRISM_HDR_LEN;
+       ndo->ndo_ll_hdr_len += ieee802_11_print(ndo, p, length, caplen, 0, 0);
  }
  
  /*
   * For DLT_IEEE802_11_RADIO; like DLT_IEEE802_11, but with an extra
   * header, containing information such as radio information.
   */
  }
  
  /*
   * For DLT_IEEE802_11_RADIO; like DLT_IEEE802_11, but with an extra
   * header, containing information such as radio information.
   */
-u_int
+void
  ieee802_11_radio_if_print(netdissect_options *ndo,
  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)
  {
  {
-       return ieee802_11_radio_print(ndo, p, h->len, h->caplen);
+       ndo->ndo_protocol = "802.11_radio";
+       ndo->ndo_ll_hdr_len += ieee802_11_radio_print(ndo, p, h->len, h->caplen);
  }
  
  /*
  }
  
  /*
@@ -3178,9 +3570,10 @@ ieee802_11_radio_if_print(netdissect_options *ndo,
   * extra header, containing information such as radio information,
   * which we currently ignore.
   */
   * extra header, containing information such as radio information,
   * which we currently ignore.
   */
-u_int
+void
  ieee802_11_radio_avs_if_print(netdissect_options *ndo,
  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";
+       ndo->ndo_ll_hdr_len += ieee802_11_radio_avs_print(ndo, p, h->len, h->caplen);
  }
  }