Skip the LLC and SNAP headers with -x.

[tcpdump] / print-802_11.c

diff --git a/print-802_11.c b/print-802_11.c
index d8404c7f20273a6fb196af630c221e77dbcfec33..2b4463ec07ac6fbf5bfde74a5af3d1792ed632e7 100644 (file)
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -26,12 +26,10 @@
 
 #include <tcpdump-stdinc.h>
 
 
 #include <tcpdump-stdinc.h>
 

-#include <stdio.h>

 #include <string.h>
 
 #include "interface.h"
 #include "addrtoname.h"
 #include <string.h>
 
 #include "interface.h"
 #include "addrtoname.h"

-#include "ethertype.h"

 
 #include "extract.h"
 
 
 #include "extract.h"
 


@@ -46,8 +44,11 @@
 #define        IEEE802_11_BSSID_LEN            6
 #define        IEEE802_11_RA_LEN               6
 #define        IEEE802_11_TA_LEN               6
 #define        IEEE802_11_BSSID_LEN            6
 #define        IEEE802_11_RA_LEN               6
 #define        IEEE802_11_TA_LEN               6

+#define        IEEE802_11_ADDR1_LEN            6

 #define        IEEE802_11_SEQ_LEN              2
 #define        IEEE802_11_CTL_LEN              2
 #define        IEEE802_11_SEQ_LEN              2
 #define        IEEE802_11_CTL_LEN              2

+#define        IEEE802_11_CARRIED_FC_LEN       2
+#define        IEEE802_11_HT_CONTROL_LEN       4

 #define        IEEE802_11_IV_LEN               3
 #define        IEEE802_11_KID_LEN              1
 
 #define        IEEE802_11_IV_LEN               3
 #define        IEEE802_11_KID_LEN              1
 


@@ -89,6 +90,21 @@
 /* RESERVED                    0xE  */
 /* RESERVED                    0xF  */
 
 /* RESERVED                    0xE  */
 /* RESERVED                    0xF  */
 

+static const struct tok st_str[] = {
+       { ST_ASSOC_REQUEST,    "Assoc Request"    },
+       { ST_ASSOC_RESPONSE,   "Assoc Response"   },
+       { ST_REASSOC_REQUEST,  "ReAssoc Request"  },
+       { ST_REASSOC_RESPONSE, "ReAssoc Response" },
+       { ST_PROBE_REQUEST,    "Probe Request"    },
+       { ST_PROBE_RESPONSE,   "Probe Response"   },
+       { ST_BEACON,           "Beacon"           },
+       { ST_ATIM,             "ATIM"             },
+       { ST_DISASSOC,         "Disassociation"   },
+       { ST_AUTH,             "Authentication"   },
+       { ST_DEAUTH,           "DeAuthentication" },
+       { ST_ACTION,           "Action"           },
+       { 0, NULL }
+};

 
 #define CTRL_CONTROL_WRAPPER   0x7
 #define        CTRL_BAR        0x8
 
 #define CTRL_CONTROL_WRAPPER   0x7
 #define        CTRL_BAR        0x8


@@ -100,6 +116,19 @@
 #define        CTRL_CF_END     0xE
 #define        CTRL_END_ACK    0xF
 
 #define        CTRL_CF_END     0xE
 #define        CTRL_END_ACK    0xF
 

+static const struct tok ctrl_str[] = {
+       { CTRL_CONTROL_WRAPPER, "Control Wrapper" },
+       { CTRL_BAR,             "BAR"             },
+       { CTRL_BA,              "BA"              },
+       { CTRL_PS_POLL,         "Power Save-Poll" },
+       { CTRL_RTS,             "Request-To-Send" },
+       { CTRL_CTS,             "Clear-To-Send"   },
+       { CTRL_ACK,             "Acknowledgment"  },
+       { CTRL_CF_END,          "CF-End"          },
+       { CTRL_END_ACK,         "CF-End+CF-Ack"   },
+       { 0, NULL }
+};
+

 #define        DATA_DATA                       0x0
 #define        DATA_DATA_CF_ACK                0x1
 #define        DATA_DATA_CF_POLL               0x2
 #define        DATA_DATA                       0x0
 #define        DATA_DATA_CF_ACK                0x1
 #define        DATA_DATA_CF_POLL               0x2


@@ -139,16 +168,16 @@
 #define        FC_RETRY(fc)            ((fc) & 0x0800)
 #define        FC_POWER_MGMT(fc)       ((fc) & 0x1000)
 #define        FC_MORE_DATA(fc)        ((fc) & 0x2000)
 #define        FC_RETRY(fc)            ((fc) & 0x0800)
 #define        FC_POWER_MGMT(fc)       ((fc) & 0x1000)
 #define        FC_MORE_DATA(fc)        ((fc) & 0x2000)

-#define        FC_WEP(fc)              ((fc) & 0x4000)
+#define        FC_PROTECTED(fc)        ((fc) & 0x4000)

 #define        FC_ORDER(fc)            ((fc) & 0x8000)
 
 struct mgmt_header_t {
 #define        FC_ORDER(fc)            ((fc) & 0x8000)
 
 struct mgmt_header_t {

-       u_int16_t       fc;
-       u_int16_t       duration;
-       u_int8_t        da[6];
-       u_int8_t        sa[6];
-       u_int8_t        bssid[6];
-       u_int16_t       seq_ctrl;
+       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;

 };
 
 #define        MGMT_HDRLEN     (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
 };
 
 #define        MGMT_HDRLEN     (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\


@@ -162,54 +191,54 @@ struct mgmt_header_t {
 #define        CAPABILITY_PRIVACY(cap) ((cap) & 0x0010)
 
 struct ssid_t {
 #define        CAPABILITY_PRIVACY(cap) ((cap) & 0x0010)
 
 struct ssid_t {

-       u_int8_t        element_id;
-       u_int8_t        length;
+       uint8_t         element_id;
+       uint8_t         length;

        u_char          ssid[33];  /* 32 + 1 for null */
 };
 
 struct rates_t {
        u_char          ssid[33];  /* 32 + 1 for null */
 };
 
 struct rates_t {

-       u_int8_t        element_id;
-       u_int8_t        length;
-       u_int8_t        rate[16];
+       uint8_t         element_id;
+       uint8_t         length;
+       uint8_t         rate[16];

 };
 
 struct challenge_t {
 };
 
 struct challenge_t {

-       u_int8_t        element_id;
-       u_int8_t        length;
-       u_int8_t        text[254]; /* 1-253 + 1 for null */
+       uint8_t         element_id;
+       uint8_t         length;
+       uint8_t         text[254]; /* 1-253 + 1 for null */

 };
 
 struct fh_t {
 };
 
 struct fh_t {

-       u_int8_t        element_id;
-       u_int8_t        length;
-       u_int16_t       dwell_time;
-       u_int8_t        hop_set;
-       u_int8_t        hop_pattern;
-       u_int8_t        hop_index;
+       uint8_t         element_id;
+       uint8_t         length;
+       uint16_t        dwell_time;
+       uint8_t         hop_set;
+       uint8_t         hop_pattern;
+       uint8_t         hop_index;

 };
 
 struct ds_t {
 };
 
 struct ds_t {

-       u_int8_t        element_id;
-       u_int8_t        length;
-       u_int8_t        channel;
+       uint8_t         element_id;
+       uint8_t         length;
+       uint8_t         channel;

 };
 
 struct cf_t {
 };
 
 struct cf_t {

-       u_int8_t        element_id;
-       u_int8_t        length;
-       u_int8_t        count;
-       u_int8_t        period;
-       u_int16_t       max_duration;
-       u_int16_t       dur_remaing;
+       uint8_t         element_id;
+       uint8_t         length;
+       uint8_t         count;
+       uint8_t         period;
+       uint16_t        max_duration;
+       uint16_t        dur_remaing;

 };
 
 struct tim_t {
 };
 
 struct tim_t {

-       u_int8_t        element_id;
-       u_int8_t        length;
-       u_int8_t        count;
-       u_int8_t        period;
-       u_int8_t        bitmap_control;
-       u_int8_t        bitmap[251];
+       uint8_t         element_id;
+       uint8_t         length;
+       uint8_t         count;
+       uint8_t         period;
+       uint8_t         bitmap_control;
+       uint8_t         bitmap[251];

 };
 
 #define        E_SSID          0
 };
 
 #define        E_SSID          0


@@ -239,18 +268,18 @@ struct tim_t {
 
 
 struct mgmt_body_t {
 
 
 struct mgmt_body_t {

-       u_int8_t        timestamp[IEEE802_11_TSTAMP_LEN];
-       u_int16_t       beacon_interval;
-       u_int16_t       listen_interval;
-       u_int16_t       status_code;
-       u_int16_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];
        u_char          ap[IEEE802_11_AP_LEN];

-       u_int16_t       reason_code;
-       u_int16_t       auth_alg;
-       u_int16_t       auth_trans_seq_num;
+       uint16_t        reason_code;
+       uint16_t        auth_alg;
+       uint16_t        auth_trans_seq_num;

        int             challenge_present;
        struct challenge_t  challenge;
        int             challenge_present;
        struct challenge_t  challenge;

-       u_int16_t       capability_info;
+       uint16_t        capability_info;

        int             ssid_present;
        struct ssid_t   ssid;
        int             rates_present;
        int             ssid_present;
        struct ssid_t   ssid;
        int             rates_present;


@@ -265,85 +294,90 @@ struct mgmt_body_t {
        struct tim_t    tim;
 };
 
        struct tim_t    tim;
 };
 

-struct ctrl_rts_t {
-       u_int16_t       fc;
-       u_int16_t       duration;
-       u_int8_t        ra[6];
-       u_int8_t        ta[6];
-       u_int8_t        fcs[4];
+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];
+};
+
+#define        CTRL_CONTROL_WRAPPER_HDRLEN     (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
+                                        IEEE802_11_ADDR1_LEN+\
+                                        IEEE802_11_CARRIED_FC_LEN+\
+                                        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];

 };
 
 #define        CTRL_RTS_HDRLEN (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
                         IEEE802_11_RA_LEN+IEEE802_11_TA_LEN)
 
 };
 
 #define        CTRL_RTS_HDRLEN (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
                         IEEE802_11_RA_LEN+IEEE802_11_TA_LEN)
 

-struct ctrl_cts_t {
-       u_int16_t       fc;
-       u_int16_t       duration;
-       u_int8_t        ra[6];
-       u_int8_t        fcs[4];
+struct ctrl_cts_hdr_t {
+       uint16_t        fc;
+       uint16_t        duration;
+       uint8_t         ra[IEEE802_11_RA_LEN];

 };
 
 #define        CTRL_CTS_HDRLEN (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+IEEE802_11_RA_LEN)
 
 };
 
 #define        CTRL_CTS_HDRLEN (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+IEEE802_11_RA_LEN)
 

-struct ctrl_ack_t {
-       u_int16_t       fc;
-       u_int16_t       duration;
-       u_int8_t        ra[6];
-       u_int8_t        fcs[4];
+struct ctrl_ack_hdr_t {
+       uint16_t        fc;
+       uint16_t        duration;
+       uint8_t         ra[IEEE802_11_RA_LEN];

 };
 
 #define        CTRL_ACK_HDRLEN (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+IEEE802_11_RA_LEN)
 
 };
 
 #define        CTRL_ACK_HDRLEN (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+IEEE802_11_RA_LEN)
 

-struct ctrl_ps_poll_t {
-       u_int16_t       fc;
-       u_int16_t       aid;
-       u_int8_t        bssid[6];
-       u_int8_t        ta[6];
-       u_int8_t        fcs[4];
+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];

 };
 
 #define        CTRL_PS_POLL_HDRLEN     (IEEE802_11_FC_LEN+IEEE802_11_AID_LEN+\
                                 IEEE802_11_BSSID_LEN+IEEE802_11_TA_LEN)
 
 };
 
 #define        CTRL_PS_POLL_HDRLEN     (IEEE802_11_FC_LEN+IEEE802_11_AID_LEN+\
                                 IEEE802_11_BSSID_LEN+IEEE802_11_TA_LEN)
 

-struct ctrl_end_t {
-       u_int16_t       fc;
-       u_int16_t       duration;
-       u_int8_t        ra[6];
-       u_int8_t        bssid[6];
-       u_int8_t        fcs[4];
+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];

 };
 
 #define        CTRL_END_HDRLEN (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
                         IEEE802_11_RA_LEN+IEEE802_11_BSSID_LEN)
 
 };
 
 #define        CTRL_END_HDRLEN (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
                         IEEE802_11_RA_LEN+IEEE802_11_BSSID_LEN)
 

-struct ctrl_end_ack_t {
-       u_int16_t       fc;
-       u_int16_t       duration;
-       u_int8_t        ra[6];
-       u_int8_t        bssid[6];
-       u_int8_t        fcs[4];
+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];

 };
 
 #define        CTRL_END_ACK_HDRLEN     (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
                                 IEEE802_11_RA_LEN+IEEE802_11_BSSID_LEN)
 
 };
 
 #define        CTRL_END_ACK_HDRLEN     (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
                                 IEEE802_11_RA_LEN+IEEE802_11_BSSID_LEN)
 

-struct ctrl_ba_t {
-       u_int16_t       fc;
-       u_int16_t       duration;
-       u_int8_t        ra[6];
-       u_int8_t        fcs[4];
+struct ctrl_ba_hdr_t {
+       uint16_t        fc;
+       uint16_t        duration;
+       uint8_t         ra[IEEE802_11_RA_LEN];

 };
 
 #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)
 

-struct ctrl_bar_t {
-       u_int16_t       fc;
-       u_int16_t       dur;
-       u_int8_t        ra[6];
-       u_int8_t        ta[6];
-       u_int16_t       ctl;
-       u_int16_t       seq;
-       u_int8_t        fcs[4];
+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;

 };
 
 #define        CTRL_BAR_HDRLEN         (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
 };
 
 #define        CTRL_BAR_HDRLEN         (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\


@@ -351,12 +385,12 @@ struct ctrl_bar_t {
                                 IEEE802_11_CTL_LEN+IEEE802_11_SEQ_LEN)
 
 struct meshcntl_t {
                                 IEEE802_11_CTL_LEN+IEEE802_11_SEQ_LEN)
 
 struct meshcntl_t {

-       u_int8_t        flags;
-       u_int8_t        ttl;
-       u_int8_t        seq[4];
-       u_int8_t        addr4[6];
-       u_int8_t        addr5[6];
-       u_int8_t        addr6[6];
+       uint8_t         flags;
+       uint8_t         ttl;
+       uint8_t         seq[4];
+       uint8_t         addr4[6];
+       uint8_t         addr5[6];
+       uint8_t         addr6[6];

 };
 
 #define        IV_IV(iv)       ((iv) & 0xFFFFFF)
 };
 
 #define        IV_IV(iv)       ((iv) & 0xFFFFFF)


@@ -416,18 +450,18 @@ struct meshcntl_t {
  * Note well: all radiotap fields are little-endian.
  */
 struct ieee80211_radiotap_header {
  * Note well: all radiotap fields are little-endian.
  */
 struct ieee80211_radiotap_header {

-       u_int8_t        it_version;     /* Version 0. Only increases
+       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.
                                         */

-       u_int8_t        it_pad;
-       u_int16_t       it_len;         /* length of the whole
+       uint8_t         it_pad;
+       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.
                                         */

-       u_int32_t       it_present;     /* A bitmap telling which
+       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.


@@ -439,25 +473,25 @@ struct ieee80211_radiotap_header {
 /* Name                                 Data type       Units
  * ----                                 ---------       -----
  *
 /* Name                                 Data type       Units
  * ----                                 ---------       -----
  *

- * IEEE80211_RADIOTAP_TSFT              u_int64_t       microseconds
+ * IEEE80211_RADIOTAP_TSFT              uint64_t       microseconds

  *
  *      Value in microseconds of the MAC's 64-bit 802.11 Time
  *      Synchronization Function timer when the first bit of the
  *      MPDU arrived at the MAC. For received frames, only.
  *
  *
  *      Value in microseconds of the MAC's 64-bit 802.11 Time
  *      Synchronization Function timer when the first bit of the
  *      MPDU arrived at the MAC. For received frames, only.
  *

- * IEEE80211_RADIOTAP_CHANNEL           2 x u_int16_t   MHz, bitmap
+ * IEEE80211_RADIOTAP_CHANNEL           2 x uint16_t   MHz, bitmap

  *
  *      Tx/Rx frequency in MHz, followed by flags (see below).
  *     Note that IEEE80211_RADIOTAP_XCHANNEL must be used to
  *     represent an HT channel as there is not enough room in
  *     the flags word.
  *
  *
  *      Tx/Rx frequency in MHz, followed by flags (see below).
  *     Note that IEEE80211_RADIOTAP_XCHANNEL must be used to
  *     represent an HT channel as there is not enough room in
  *     the flags word.
  *

- * IEEE80211_RADIOTAP_FHSS              u_int16_t       see below
+ * IEEE80211_RADIOTAP_FHSS              uint16_t       see below

  *
  *      For frequency-hopping radios, the hop set (first byte)
  *      and pattern (second byte).
  *
  *
  *      For frequency-hopping radios, the hop set (first byte)
  *      and pattern (second byte).
  *

- * IEEE80211_RADIOTAP_RATE              u_int8_t        500kb/s or index
+ * IEEE80211_RADIOTAP_RATE              uint8_t        500kb/s or index

  *
  *      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.


@@ -474,30 +508,30 @@ struct ieee80211_radiotap_header {
  *      RF noise power at the antenna, decibel difference from one
  *      milliwatt.
  *
  *      RF noise power at the antenna, decibel difference from one
  *      milliwatt.
  *

- * IEEE80211_RADIOTAP_DB_ANTSIGNAL      u_int8_t        decibel (dB)
+ * IEEE80211_RADIOTAP_DB_ANTSIGNAL      uint8_t        decibel (dB)

  *
  *      RF signal power at the antenna, decibel difference from an
  *      arbitrary, fixed reference.
  *
  *
  *      RF signal power at the antenna, decibel difference from an
  *      arbitrary, fixed reference.
  *

- * IEEE80211_RADIOTAP_DB_ANTNOISE       u_int8_t        decibel (dB)
+ * IEEE80211_RADIOTAP_DB_ANTNOISE       uint8_t        decibel (dB)

  *
  *      RF noise power at the antenna, decibel difference from an
  *      arbitrary, fixed reference point.
  *
  *
  *      RF noise power at the antenna, decibel difference from an
  *      arbitrary, fixed reference point.
  *

- * IEEE80211_RADIOTAP_LOCK_QUALITY      u_int16_t       unitless
+ * IEEE80211_RADIOTAP_LOCK_QUALITY      uint16_t       unitless

  *
  *      Quality of Barker code lock. Unitless. Monotonically
  *      nondecreasing with "better" lock strength. Called "Signal
  *      Quality" in datasheets.  (Is there a standard way to measure
  *      this?)
  *
  *
  *      Quality of Barker code lock. Unitless. Monotonically
  *      nondecreasing with "better" lock strength. Called "Signal
  *      Quality" in datasheets.  (Is there a standard way to measure
  *      this?)
  *

- * IEEE80211_RADIOTAP_TX_ATTENUATION    u_int16_t       unitless
+ * IEEE80211_RADIOTAP_TX_ATTENUATION    uint16_t       unitless

  *
  *      Transmit power expressed as unitless distance from max
  *      power set at factory calibration.  0 is max power.
  *      Monotonically nondecreasing with lower power levels.
  *
  *
  *      Transmit power expressed as unitless distance from max
  *      power set at factory calibration.  0 is max power.
  *      Monotonically nondecreasing with lower power levels.
  *

- * IEEE80211_RADIOTAP_DB_TX_ATTENUATION u_int16_t       decibels (dB)
+ * IEEE80211_RADIOTAP_DB_TX_ATTENUATION uint16_t       decibels (dB)

  *
  *      Transmit power expressed as decibel distance from max power
  *      set at factory calibration.  0 is max power.  Monotonically
  *
  *      Transmit power expressed as decibel distance from max power
  *      set at factory calibration.  0 is max power.  Monotonically


@@ -510,24 +544,24 @@ struct ieee80211_radiotap_header {
  *      reference). This is the absolute power level measured at
  *      the antenna port.
  *
  *      reference). This is the absolute power level measured at
  *      the antenna port.
  *

- * IEEE80211_RADIOTAP_FLAGS             u_int8_t        bitmap
+ * IEEE80211_RADIOTAP_FLAGS             uint8_t        bitmap

  *
  *      Properties of transmitted and received frames. See flags
  *      defined below.
  *
  *
  *      Properties of transmitted and received frames. See flags
  *      defined below.
  *

- * IEEE80211_RADIOTAP_ANTENNA           u_int8_t        antenna index
+ * IEEE80211_RADIOTAP_ANTENNA           uint8_t        antenna index

  *
  *      Unitless indication of the Rx/Tx antenna for this packet.
  *      The first antenna is antenna 0.
  *
  *
  *      Unitless indication of the Rx/Tx antenna for this packet.
  *      The first antenna is antenna 0.
  *

- * IEEE80211_RADIOTAP_RX_FLAGS          u_int16_t       bitmap
+ * IEEE80211_RADIOTAP_RX_FLAGS          uint16_t       bitmap

  *
  *     Properties of received frames. See flags defined below.
  *
  *
  *     Properties of received frames. See flags defined below.
  *

- * IEEE80211_RADIOTAP_XCHANNEL          u_int32_t      bitmap
- *                                     u_int16_t       MHz
- *                                     u_int8_t        channel number
- *                                     u_int8_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


@@ -535,18 +569,18 @@ 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              u_int8_t        known
- *                                     u_int8_t        flags
- *                                     u_int8_t        mcs
+ * IEEE80211_RADIOTAP_MCS              uint8_t         known
+ *                                     uint8_t         flags
+ *                                     uint8_t         mcs

  *
  *     Bitset indicating which fields have known values, followed
  *     by bitset of flag values, followed by the MCS rate index as
  *     in IEEE 802.11n.
  *
  * IEEE80211_RADIOTAP_VENDOR_NAMESPACE
  *
  *     Bitset indicating which fields have known values, followed
  *     by bitset of flag values, followed by the MCS rate index as
  *     in IEEE 802.11n.
  *
  * IEEE80211_RADIOTAP_VENDOR_NAMESPACE

- *                                     u_int8_t  OUI[3]
- *                                   u_int8_t  subspace
- *                                   u_int16_t length
+ *                                     uint8_t  OUI[3]
+ *                                   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


@@ -662,20 +696,20 @@ static const char tstr[] = "[|802.11]";
 /*  This is used to save state when parsing/processing parameters */
 struct radiotap_state
 {
 /*  This is used to save state when parsing/processing parameters */
 struct radiotap_state
 {

-       u_int32_t       present;
+       uint32_t        present;

 
 

-       u_int8_t        rate;
+       uint8_t         rate;

 };
 
 #define PRINT_SSID(p) \
        if (p.ssid_present) { \
 };
 
 #define PRINT_SSID(p) \
        if (p.ssid_present) { \

-               printf(" ("); \
-               fn_print(p.ssid.ssid, NULL); \
-               printf(")"); \
+               ND_PRINT((ndo, " (")); \
+               fn_print(ndo, p.ssid.ssid, NULL); \
+               ND_PRINT((ndo, ")")); \

        }
 
 #define PRINT_RATE(_sep, _r, _suf) \
        }
 
 #define PRINT_RATE(_sep, _r, _suf) \

-       printf("%s%2.1f%s", _sep, (.5 * ((_r) & 0x7f)), _suf)
+       ND_PRINT((ndo, "%s%2.1f%s", _sep, (.5 * ((_r) & 0x7f)), _suf))

 #define PRINT_RATES(p) \
        if (p.rates_present) { \
                int z; \
 #define PRINT_RATES(p) \
        if (p.rates_present) { \
                int z; \


@@ -686,14 +720,14 @@ struct radiotap_state
                        sep = " "; \
                } \
                if (p.rates.length != 0) \
                        sep = " "; \
                } \
                if (p.rates.length != 0) \

-                       printf(" Mbit]"); \
+                       ND_PRINT((ndo, " Mbit]")); \

        }
 
 #define PRINT_DS_CHANNEL(p) \
        if (p.ds_present) \
        }
 
 #define PRINT_DS_CHANNEL(p) \
        if (p.ds_present) \

-               printf(" CH: %u", p.ds.channel); \
-       printf("%s", \
-           CAPABILITY_PRIVACY(p.capability_info) ? ", PRIVACY" : "" );
+               ND_PRINT((ndo, " CH: %u", p.ds.channel)); \
+       ND_PRINT((ndo, "%s", \
+           CAPABILITY_PRIVACY(p.capability_info) ? ", PRIVACY" : ""));

 
 #define MAX_MCS_INDEX  76
 
 
 #define MAX_MCS_INDEX  76
 


@@ -1160,9 +1194,7 @@ static const char *status_text[] = {
        "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. "
        "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. "

-         "However, a suggested TSPEC is provided so that the initiating QSTA"
-         "may attempt to set another TS with the suggested changes to the "
-         "TSPEC",                                              /* 39 */
+         "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 */
        "Invalid Information Element",                          /* 40 */
        "Group Cipher is not valid",                            /* 41 */
        "Pairwise Cipher is not valid",                         /* 42 */


@@ -1249,23 +1281,25 @@ static const char *reason_text[] = {
 #define NUM_REASONS    (sizeof reason_text / sizeof reason_text[0])
 
 static int
 #define NUM_REASONS    (sizeof reason_text / sizeof reason_text[0])
 
 static int

-wep_print(const u_char *p)
+wep_print(netdissect_options *ndo,
+          const u_char *p)

 {
 {

-       u_int32_t iv;
+       uint32_t iv;

 
 

-       if (!TTEST2(*p, IEEE802_11_IV_LEN + IEEE802_11_KID_LEN))
+       if (!ND_TTEST2(*p, IEEE802_11_IV_LEN + IEEE802_11_KID_LEN))

                return 0;
        iv = EXTRACT_LE_32BITS(p);
 
                return 0;
        iv = EXTRACT_LE_32BITS(p);
 

-       printf("Data IV:%3x Pad %x KeyID %x", IV_IV(iv), IV_PAD(iv),
-           IV_KEYID(iv));
+       ND_PRINT((ndo, " IV:%3x Pad %x KeyID %x", IV_IV(iv), IV_PAD(iv),
+           IV_KEYID(iv)));

 
        return 1;
 }
 
 static int
 
        return 1;
 }
 
 static int

-parse_elements(struct mgmt_body_t *pbody, const u_char *p, int offset,
-    u_int length)
+parse_elements(netdissect_options *ndo,
+               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;


@@ -1286,23 +1320,28 @@ parse_elements(struct mgmt_body_t *pbody, const u_char *p, int offset,
        pbody->tim_present = 0;
 
        while (length != 0) {
        pbody->tim_present = 0;
 
        while (length != 0) {

-               if (!TTEST2(*(p + offset), 1))
+               /* Make sure we at least have the element ID and length. */
+               if (!ND_TTEST2(*(p + offset), 2))
+                       return 0;
+               if (length < 2)

                        return 0;
                        return 0;

-               if (length < 1)
+               elementlen = *(p + offset + 1);
+
+               /* Make sure we have the entire element. */
+               if (!ND_TTEST2(*(p + offset + 2), elementlen))
+                       return 0;
+               if (length < elementlen + 2)

                        return 0;
                        return 0;

+

                switch (*(p + offset)) {
                case E_SSID:
                switch (*(p + offset)) {
                case E_SSID:

-                       if (!TTEST2(*(p + offset), 2))
-                               return 0;
-                       if (length < 2)
-                               return 0;

                        memcpy(&ssid, p + offset, 2);
                        offset += 2;
                        length -= 2;
                        if (ssid.length != 0) {
                                if (ssid.length > sizeof(ssid.ssid) - 1)
                                        return 0;
                        memcpy(&ssid, p + offset, 2);
                        offset += 2;
                        length -= 2;
                        if (ssid.length != 0) {
                                if (ssid.length > sizeof(ssid.ssid) - 1)
                                        return 0;

-                               if (!TTEST2(*(p + offset), ssid.length))
+                               if (!ND_TTEST2(*(p + offset), ssid.length))

                                        return 0;
                                if (length < ssid.length)
                                        return 0;
                                        return 0;
                                if (length < ssid.length)
                                        return 0;


@@ -1324,10 +1363,6 @@ parse_elements(struct mgmt_body_t *pbody, const u_char *p, int offset,
                        }
                        break;
                case E_CHALLENGE:
                        }
                        break;
                case E_CHALLENGE:

-                       if (!TTEST2(*(p + offset), 2))
-                               return 0;
-                       if (length < 2)
-                               return 0;

                        memcpy(&challenge, p + offset, 2);
                        offset += 2;
                        length -= 2;
                        memcpy(&challenge, p + offset, 2);
                        offset += 2;
                        length -= 2;


@@ -1335,7 +1370,7 @@ parse_elements(struct mgmt_body_t *pbody, const u_char *p, int offset,
                                if (challenge.length >
                                    sizeof(challenge.text) - 1)
                                        return 0;
                                if (challenge.length >
                                    sizeof(challenge.text) - 1)
                                        return 0;

-                               if (!TTEST2(*(p + offset), challenge.length))
+                               if (!ND_TTEST2(*(p + offset), challenge.length))

                                        return 0;
                                if (length < challenge.length)
                                        return 0;
                                        return 0;
                                if (length < challenge.length)
                                        return 0;


@@ -1358,17 +1393,13 @@ parse_elements(struct mgmt_body_t *pbody, const u_char *p, int offset,
                        }
                        break;
                case E_RATES:
                        }
                        break;
                case E_RATES:

-                       if (!TTEST2(*(p + offset), 2))
-                               return 0;
-                       if (length < 2)
-                               return 0;

                        memcpy(&rates, p + offset, 2);
                        offset += 2;
                        length -= 2;
                        if (rates.length != 0) {
                                if (rates.length > sizeof rates.rate)
                                        return 0;
                        memcpy(&rates, p + offset, 2);
                        offset += 2;
                        length -= 2;
                        if (rates.length != 0) {
                                if (rates.length > sizeof rates.rate)
                                        return 0;

-                               if (!TTEST2(*(p + offset), rates.length))
+                               if (!ND_TTEST2(*(p + offset), rates.length))

                                        return 0;
                                if (length < rates.length)
                                        return 0;
                                        return 0;
                                if (length < rates.length)
                                        return 0;


@@ -1398,13 +1429,17 @@ parse_elements(struct mgmt_body_t *pbody, const u_char *p, int offset,
                        }
                        break;
                case E_DS:
                        }
                        break;
                case E_DS:

-                       if (!TTEST2(*(p + offset), 3))
-                               return 0;
-                       if (length < 3)
-                               return 0;
-                       memcpy(&ds, p + offset, 3);
-                       offset += 3;
-                       length -= 3;
+                       memcpy(&ds, p + offset, 2);
+                       offset += 2;
+                       length -= 2;
+                       if (ds.length != 1) {
+                               offset += ds.length;
+                               length -= ds.length;
+                               break;
+                       }
+                       ds.channel = *(p + offset);
+                       offset += 1;
+                       length -= 1;

                        /*
                         * Present and not truncated.
                         *
                        /*
                         * Present and not truncated.
                         *


@@ -1418,13 +1453,17 @@ parse_elements(struct mgmt_body_t *pbody, const u_char *p, int offset,
                        }
                        break;
                case E_CF:
                        }
                        break;
                case E_CF:

-                       if (!TTEST2(*(p + offset), 8))
-                               return 0;
-                       if (length < 8)
-                               return 0;
-                       memcpy(&cf, p + offset, 8);
-                       offset += 8;
-                       length -= 8;
+                       memcpy(&cf, p + offset, 2);
+                       offset += 2;
+                       length -= 2;
+                       if (cf.length != 6) {
+                               offset += cf.length;
+                               length -= cf.length;
+                               break;
+                       }
+                       memcpy(&cf.count, p + offset, 6);
+                       offset += 6;
+                       length -= 6;

                        /*
                         * Present and not truncated.
                         *
                        /*
                         * Present and not truncated.
                         *


@@ -1438,29 +1477,20 @@ parse_elements(struct mgmt_body_t *pbody, const u_char *p, int offset,
                        }
                        break;
                case E_TIM:
                        }
                        break;
                case E_TIM:

-                       if (!TTEST2(*(p + offset), 2))
-                               return 0;
-                       if (length < 2)
-                               return 0;

                        memcpy(&tim, p + offset, 2);
                        offset += 2;
                        length -= 2;
                        memcpy(&tim, p + offset, 2);
                        offset += 2;
                        length -= 2;

-                       if (!TTEST2(*(p + offset), 3))
-                               return 0;
-                       if (length < 3)
+                       if (tim.length <= 3) {
+                               offset += tim.length;
+                               length -= tim.length;
+                               break;
+                       }
+                       if (tim.length - 3 > (int)sizeof tim.bitmap)

                                return 0;
                        memcpy(&tim.count, p + offset, 3);
                        offset += 3;
                        length -= 3;
 
                                return 0;
                        memcpy(&tim.count, p + offset, 3);
                        offset += 3;
                        length -= 3;
 

-                       if (tim.length <= 3)
-                               break;
-                       if (tim.length - 3 > (int)sizeof tim.bitmap)
-                               return 0;
-                       if (!TTEST2(*(p + offset), tim.length - 3))
-                               return 0;
-                       if (length < (u_int)(tim.length - 3))
-                               return 0;

                        memcpy(tim.bitmap, p + (tim.length - 3),
                            (tim.length - 3));
                        offset += tim.length - 3;
                        memcpy(tim.bitmap, p + (tim.length - 3),
                            (tim.length - 3));
                        offset += tim.length - 3;


@@ -1479,20 +1509,11 @@ parse_elements(struct mgmt_body_t *pbody, const u_char *p, int offset,
                        break;
                default:
 #if 0
                        break;
                default:
 #if 0

-                       printf("(1) unhandled element_id (%d)  ",
-                           *(p + offset));
+                       ND_PRINT((ndo, "(1) unhandled element_id (%d)  ",
+                           *(p + offset)));

 #endif
 #endif

-                       if (!TTEST2(*(p + offset), 2))
-                               return 0;
-                       if (length < 2)
-                               return 0;
-                       elementlen = *(p + offset + 1);
-                       if (!TTEST2(*(p + offset + 2), elementlen))
-                               return 0;
-                       if (length < elementlen + 2)
-                               return 0;
-                       offset += elementlen + 2;
-                       length -= elementlen + 2;
+                       offset += 2 + elementlen;
+                       length -= 2 + elementlen;

                        break;
                }
        }
                        break;
                }
        }


@@ -1506,7 +1527,8 @@ parse_elements(struct mgmt_body_t *pbody, const u_char *p, int offset,
  *********************************************************************************/
 
 static int
  *********************************************************************************/
 
 static int

-handle_beacon(const u_char *p, u_int length)
+handle_beacon(netdissect_options *ndo,
+              const u_char *p, u_int length)

 {
        struct mgmt_body_t pbody;
        int offset = 0;
 {
        struct mgmt_body_t pbody;
        int offset = 0;


@@ -1514,7 +1536,7 @@ handle_beacon(const u_char *p, u_int length)
 
        memset(&pbody, 0, sizeof(pbody));
 
 
        memset(&pbody, 0, sizeof(pbody));
 

-       if (!TTEST2(*p, IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN +
+       if (!ND_TTEST2(*p, IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN +

            IEEE802_11_CAPINFO_LEN))
                return 0;
        if (length < IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN +
            IEEE802_11_CAPINFO_LEN))
                return 0;
        if (length < IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN +


@@ -1530,19 +1552,20 @@ handle_beacon(const u_char *p, u_int length)
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;
 
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;
 

-       ret = parse_elements(&pbody, p, offset, length);
+       ret = parse_elements(ndo, &pbody, p, offset, length);

 
        PRINT_SSID(pbody);
        PRINT_RATES(pbody);
 
        PRINT_SSID(pbody);
        PRINT_RATES(pbody);

-       printf(" %s",
-           CAPABILITY_ESS(pbody.capability_info) ? "ESS" : "IBSS");
+       ND_PRINT((ndo, " %s",
+           CAPABILITY_ESS(pbody.capability_info) ? "ESS" : "IBSS"));

        PRINT_DS_CHANNEL(pbody);
 
        return ret;
 }
 
 static int
        PRINT_DS_CHANNEL(pbody);
 
        return ret;
 }
 
 static int

-handle_assoc_request(const u_char *p, u_int length)
+handle_assoc_request(netdissect_options *ndo,
+                     const u_char *p, u_int length)

 {
        struct mgmt_body_t pbody;
        int offset = 0;
 {
        struct mgmt_body_t pbody;
        int offset = 0;


@@ -1550,7 +1573,7 @@ handle_assoc_request(const u_char *p, u_int length)
 
        memset(&pbody, 0, sizeof(pbody));
 
 
        memset(&pbody, 0, sizeof(pbody));
 

-       if (!TTEST2(*p, IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN))
+       if (!ND_TTEST2(*p, IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN))

                return 0;
        if (length < IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN)
                return 0;
                return 0;
        if (length < IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN)
                return 0;


@@ -1561,7 +1584,7 @@ handle_assoc_request(const u_char *p, u_int length)
        offset += IEEE802_11_LISTENINT_LEN;
        length -= IEEE802_11_LISTENINT_LEN;
 
        offset += IEEE802_11_LISTENINT_LEN;
        length -= IEEE802_11_LISTENINT_LEN;
 

-       ret = parse_elements(&pbody, p, offset, length);
+       ret = parse_elements(ndo, &pbody, p, offset, length);

 
        PRINT_SSID(pbody);
        PRINT_RATES(pbody);
 
        PRINT_SSID(pbody);
        PRINT_RATES(pbody);


@@ -1569,7 +1592,8 @@ handle_assoc_request(const u_char *p, u_int length)
 }
 
 static int
 }
 
 static int

-handle_assoc_response(const u_char *p, u_int length)
+handle_assoc_response(netdissect_options *ndo,
+                      const u_char *p, u_int length)

 {
        struct mgmt_body_t pbody;
        int offset = 0;
 {
        struct mgmt_body_t pbody;
        int offset = 0;


@@ -1577,7 +1601,7 @@ handle_assoc_response(const u_char *p, u_int length)
 
        memset(&pbody, 0, sizeof(pbody));
 
 
        memset(&pbody, 0, sizeof(pbody));
 

-       if (!TTEST2(*p, IEEE802_11_CAPINFO_LEN + IEEE802_11_STATUS_LEN +
+       if (!ND_TTEST2(*p, IEEE802_11_CAPINFO_LEN + IEEE802_11_STATUS_LEN +

            IEEE802_11_AID_LEN))
                return 0;
        if (length < IEEE802_11_CAPINFO_LEN + IEEE802_11_STATUS_LEN +
            IEEE802_11_AID_LEN))
                return 0;
        if (length < IEEE802_11_CAPINFO_LEN + IEEE802_11_STATUS_LEN +


@@ -1593,19 +1617,20 @@ handle_assoc_response(const u_char *p, u_int length)
        offset += IEEE802_11_AID_LEN;
        length -= IEEE802_11_AID_LEN;
 
        offset += IEEE802_11_AID_LEN;
        length -= IEEE802_11_AID_LEN;
 

-       ret = parse_elements(&pbody, p, offset, length);
+       ret = parse_elements(ndo, &pbody, p, offset, length);

 
 

-       printf(" AID(%x) :%s: %s", ((u_int16_t)(pbody.aid << 2 )) >> 2 ,
+       ND_PRINT((ndo, " 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;
 }
 
 static int
 
        return ret;
 }
 
 static int

-handle_reassoc_request(const u_char *p, u_int length)
+handle_reassoc_request(netdissect_options *ndo,
+                       const u_char *p, u_int length)

 {
        struct mgmt_body_t pbody;
        int offset = 0;
 {
        struct mgmt_body_t pbody;
        int offset = 0;


@@ -1613,7 +1638,7 @@ handle_reassoc_request(const u_char *p, u_int length)
 
        memset(&pbody, 0, sizeof(pbody));
 
 
        memset(&pbody, 0, sizeof(pbody));
 

-       if (!TTEST2(*p, IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN +
+       if (!ND_TTEST2(*p, IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN +

            IEEE802_11_AP_LEN))
                return 0;
        if (length < IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN +
            IEEE802_11_AP_LEN))
                return 0;
        if (length < IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN +


@@ -1629,23 +1654,25 @@ handle_reassoc_request(const u_char *p, u_int length)
        offset += IEEE802_11_AP_LEN;
        length -= IEEE802_11_AP_LEN;
 
        offset += IEEE802_11_AP_LEN;
        length -= IEEE802_11_AP_LEN;
 

-       ret = parse_elements(&pbody, p, offset, length);
+       ret = parse_elements(ndo, &pbody, p, offset, length);

 
        PRINT_SSID(pbody);
 
        PRINT_SSID(pbody);

-       printf(" AP : %s", etheraddr_string( pbody.ap ));
+       ND_PRINT((ndo, " AP : %s", etheraddr_string(ndo,  pbody.ap )));

 
        return ret;
 }
 
 static int
 
        return ret;
 }
 
 static int

-handle_reassoc_response(const u_char *p, u_int length)
+handle_reassoc_response(netdissect_options *ndo,
+                        const u_char *p, u_int length)

 {
        /* Same as a Association Reponse */
 {
        /* Same as a Association Reponse */

-       return handle_assoc_response(p, length);
+       return handle_assoc_response(ndo, p, length);

 }
 
 static int
 }
 
 static int

-handle_probe_request(const u_char *p, u_int length)
+handle_probe_request(netdissect_options *ndo,
+                     const u_char *p, u_int length)

 {
        struct mgmt_body_t  pbody;
        int offset = 0;
 {
        struct mgmt_body_t  pbody;
        int offset = 0;


@@ -1653,7 +1680,7 @@ handle_probe_request(const u_char *p, u_int length)
 
        memset(&pbody, 0, sizeof(pbody));
 
 
        memset(&pbody, 0, sizeof(pbody));
 

-       ret = parse_elements(&pbody, p, offset, length);
+       ret = parse_elements(ndo, &pbody, p, offset, length);

 
        PRINT_SSID(pbody);
        PRINT_RATES(pbody);
 
        PRINT_SSID(pbody);
        PRINT_RATES(pbody);


@@ -1662,7 +1689,8 @@ handle_probe_request(const u_char *p, u_int length)
 }
 
 static int
 }
 
 static int

-handle_probe_response(const u_char *p, u_int length)
+handle_probe_response(netdissect_options *ndo,
+                      const u_char *p, u_int length)

 {
        struct mgmt_body_t  pbody;
        int offset = 0;
 {
        struct mgmt_body_t  pbody;
        int offset = 0;


@@ -1670,7 +1698,7 @@ handle_probe_response(const u_char *p, u_int length)
 
        memset(&pbody, 0, sizeof(pbody));
 
 
        memset(&pbody, 0, sizeof(pbody));
 

-       if (!TTEST2(*p, IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN +
+       if (!ND_TTEST2(*p, IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN +

            IEEE802_11_CAPINFO_LEN))
                return 0;
        if (length < IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN +
            IEEE802_11_CAPINFO_LEN))
                return 0;
        if (length < IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN +


@@ -1686,7 +1714,7 @@ handle_probe_response(const u_char *p, u_int length)
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;
 
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;
 

-       ret = parse_elements(&pbody, p, offset, length);
+       ret = parse_elements(ndo, &pbody, p, offset, length);

 
        PRINT_SSID(pbody);
        PRINT_RATES(pbody);
 
        PRINT_SSID(pbody);
        PRINT_RATES(pbody);


@@ -1703,28 +1731,30 @@ handle_atim(void)
 }
 
 static int
 }
 
 static int

-handle_disassoc(const u_char *p, u_int length)
+handle_disassoc(netdissect_options *ndo,
+                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 (!TTEST2(*p, IEEE802_11_REASON_LEN))
+       if (!ND_TTEST2(*p, IEEE802_11_REASON_LEN))

                return 0;
        if (length < IEEE802_11_REASON_LEN)
                return 0;
        pbody.reason_code = EXTRACT_LE_16BITS(p);
 
                return 0;
        if (length < IEEE802_11_REASON_LEN)
                return 0;
        pbody.reason_code = EXTRACT_LE_16BITS(p);
 

-       printf(": %s",
+       ND_PRINT((ndo, ": %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;
 }
 
 static int
 
        return 1;
 }
 
 static int

-handle_auth(const u_char *p, u_int length)
+handle_auth(netdissect_options *ndo,
+            const u_char *p, u_int length)

 {
        struct mgmt_body_t  pbody;
        int offset = 0;
 {
        struct mgmt_body_t  pbody;
        int offset = 0;


@@ -1732,7 +1762,7 @@ handle_auth(const u_char *p, u_int length)
 
        memset(&pbody, 0, sizeof(pbody));
 
 
        memset(&pbody, 0, sizeof(pbody));
 

-       if (!TTEST2(*p, 6))
+       if (!ND_TTEST2(*p, 6))

                return 0;
        if (length < 6)
                return 0;
                return 0;
        if (length < 6)
                return 0;


@@ -1746,12 +1776,12 @@ handle_auth(const u_char *p, u_int length)
        offset += 2;
        length -= 2;
 
        offset += 2;
        length -= 2;
 

-       ret = parse_elements(&pbody, p, offset, length);
+       ret = parse_elements(ndo, &pbody, p, offset, length);

 
        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))) {

-               printf(" (%s)-%x [Challenge Text] %s",
+               ND_PRINT((ndo, " (%s)-%x [Challenge Text] %s",

                    (pbody.auth_alg < NUM_AUTH_ALGS)
                        ? auth_alg_text[pbody.auth_alg]
                        : "Reserved",
                    (pbody.auth_alg < NUM_AUTH_ALGS)
                        ? auth_alg_text[pbody.auth_alg]
                        : "Reserved",


@@ -1759,10 +1789,10 @@ handle_auth(const u_char *p, u_int length)
                    ((pbody.auth_trans_seq_num % 2)
                        ? ((pbody.status_code < NUM_STATUSES)
                               ? status_text[pbody.status_code]
                    ((pbody.auth_trans_seq_num % 2)
                        ? ((pbody.status_code < NUM_STATUSES)
                               ? status_text[pbody.status_code]

-                              : "n/a") : ""));
+                              : "n/a") : "")));

                return ret;
        }
                return ret;
        }

-       printf(" (%s)-%x: %s",
+       ND_PRINT((ndo, " (%s)-%x: %s",

            (pbody.auth_alg < NUM_AUTH_ALGS)
                ? auth_alg_text[pbody.auth_alg]
                : "Reserved",
            (pbody.auth_alg < NUM_AUTH_ALGS)
                ? auth_alg_text[pbody.auth_alg]
                : "Reserved",


@@ -1771,20 +1801,21 @@ handle_auth(const u_char *p, u_int length)
                ? ((pbody.status_code < NUM_STATUSES)
                    ? status_text[pbody.status_code]
                    : "n/a")
                ? ((pbody.status_code < NUM_STATUSES)
                    ? status_text[pbody.status_code]
                    : "n/a")

-               : "");
+               : ""));

 
        return ret;
 }
 
 static int
 
        return ret;
 }
 
 static int

-handle_deauth(const struct mgmt_header_t *pmh, const u_char *p, u_int length)
+handle_deauth(netdissect_options *ndo,
+              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 (!TTEST2(*p, IEEE802_11_REASON_LEN))
+       if (!ND_TTEST2(*p, IEEE802_11_REASON_LEN))

                return 0;
        if (length < IEEE802_11_REASON_LEN)
                return 0;
                return 0;
        if (length < IEEE802_11_REASON_LEN)
                return 0;


@@ -1794,100 +1825,101 @@ handle_deauth(const struct mgmt_header_t *pmh, const u_char *p, u_int length)
                        ? reason_text[pbody.reason_code]
                        : "Reserved";
 
                        ? reason_text[pbody.reason_code]
                        : "Reserved";
 

-       if (eflag) {
-               printf(": %s", reason);
+       if (ndo->ndo_eflag) {
+               ND_PRINT((ndo, ": %s", reason));

        } else {
        } else {

-               printf(" (%s): %s", etheraddr_string(pmh->sa), reason);
+               ND_PRINT((ndo, " (%s): %s", etheraddr_string(ndo, src), reason));

        }
        return 1;
 }
 
 #define        PRINT_HT_ACTION(v) (\
        }
        return 1;
 }
 
 #define        PRINT_HT_ACTION(v) (\

-       (v) == 0 ? printf("TxChWidth") : \
-       (v) == 1 ? printf("MIMOPwrSave") : \
-                  printf("Act#%d", (v)) \
+       (v) == 0 ? ND_PRINT((ndo, "TxChWidth")) : \
+       (v) == 1 ? ND_PRINT((ndo, "MIMOPwrSave")) : \
+                  ND_PRINT((ndo, "Act#%d", (v))) \

 )
 #define        PRINT_BA_ACTION(v) (\
 )
 #define        PRINT_BA_ACTION(v) (\

-       (v) == 0 ? printf("ADDBA Request") : \
-       (v) == 1 ? printf("ADDBA Response") : \
-       (v) == 2 ? printf("DELBA") : \
-                  printf("Act#%d", (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) (\
 )
 #define        PRINT_MESHLINK_ACTION(v) (\

-       (v) == 0 ? printf("Request") : \
-       (v) == 1 ? printf("Report") : \
-                  printf("Act#%d", (v)) \
+       (v) == 0 ? ND_PRINT((ndo, "Request")) : \
+       (v) == 1 ? ND_PRINT((ndo, "Report")) : \
+                  ND_PRINT((ndo, "Act#%d", (v))) \

 )
 #define        PRINT_MESHPEERING_ACTION(v) (\
 )
 #define        PRINT_MESHPEERING_ACTION(v) (\

-       (v) == 0 ? printf("Open") : \
-       (v) == 1 ? printf("Confirm") : \
-       (v) == 2 ? printf("Close") : \
-                  printf("Act#%d", (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) (\
 )
 #define        PRINT_MESHPATH_ACTION(v) (\

-       (v) == 0 ? printf("Request") : \
-       (v) == 1 ? printf("Report") : \
-       (v) == 2 ? printf("Error") : \
-       (v) == 3 ? printf("RootAnnouncement") : \
-                  printf("Act#%d", (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) (\
 )
 
 #define PRINT_MESH_ACTION(v) (\

-       (v) == 0 ? printf("MeshLink") : \
-       (v) == 1 ? printf("HWMP") : \
-       (v) == 2 ? printf("Gate Announcement") : \
-       (v) == 3 ? printf("Congestion Control") : \
-       (v) == 4 ? printf("MCCA Setup Request") : \
-       (v) == 5 ? printf("MCCA Setup Reply") : \
-       (v) == 6 ? printf("MCCA Advertisement Request") : \
-       (v) == 7 ? printf("MCCA Advertisement") : \
-       (v) == 8 ? printf("MCCA Teardown") : \
-       (v) == 9 ? printf("TBTT Adjustment Request") : \
-       (v) == 10 ? printf("TBTT Adjustment Response") : \
-                  printf("Act#%d", (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) (\
 )
 #define PRINT_MULTIHOP_ACTION(v) (\

-       (v) == 0 ? printf("Proxy Update") : \
-       (v) == 1 ? printf("Proxy Update Confirmation") : \
-                  printf("Act#%d", (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) (\
 )
 #define PRINT_SELFPROT_ACTION(v) (\

-       (v) == 1 ? printf("Peering Open") : \
-       (v) == 2 ? printf("Peering Confirm") : \
-       (v) == 3 ? printf("Peering Close") : \
-       (v) == 4 ? printf("Group Key Inform") : \
-       (v) == 5 ? printf("Group Key Acknowledge") : \
-                  printf("Act#%d", (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 int
 )
 
 static int

-handle_action(const struct mgmt_header_t *pmh, const u_char *p, u_int length)
+handle_action(netdissect_options *ndo,
+              const uint8_t *src, const u_char *p, u_int length)

 {
 {

-       if (!TTEST2(*p, 2))
+       if (!ND_TTEST2(*p, 2))

                return 0;
        if (length < 2)
                return 0;
                return 0;
        if (length < 2)
                return 0;

-       if (eflag) {
-               printf(": ");
+       if (ndo->ndo_eflag) {
+               ND_PRINT((ndo, ": "));

        } else {
        } else {

-               printf(" (%s): ", etheraddr_string(pmh->sa));
+               ND_PRINT((ndo, " (%s): ", etheraddr_string(ndo, src)));

        }
        switch (p[0]) {
        }
        switch (p[0]) {

-       case 0: printf("Spectrum Management Act#%d", p[1]); break;
-       case 1: printf("QoS Act#%d", p[1]); break;
-       case 2: printf("DLS Act#%d", p[1]); break;
-       case 3: printf("BA "); PRINT_BA_ACTION(p[1]); break;
-       case 7: printf("HT "); PRINT_HT_ACTION(p[1]); break;
-       case 13: printf("MeshAction "); PRINT_MESH_ACTION(p[1]); break;
+       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:
        case 14:

-               printf("MultiohopAction ");
+               ND_PRINT((ndo, "MultiohopAction "));

                PRINT_MULTIHOP_ACTION(p[1]); break;
        case 15:
                PRINT_MULTIHOP_ACTION(p[1]); break;
        case 15:

-               printf("SelfprotectAction ");
+               ND_PRINT((ndo, "SelfprotectAction "));

                PRINT_SELFPROT_ACTION(p[1]); break;
                PRINT_SELFPROT_ACTION(p[1]); break;

-       case 127: printf("Vendor Act#%d", p[1]); break;
+       case 127: ND_PRINT((ndo, "Vendor Act#%d", p[1])); break;

        default:
        default:

-               printf("Reserved(%d) Act#%d", p[0], p[1]);
+               ND_PRINT((ndo, "Reserved(%d) Act#%d", p[0], p[1]));

                break;
        }
        return 1;
                break;
        }
        return 1;


@@ -1900,57 +1932,40 @@ handle_action(const struct mgmt_header_t *pmh, const u_char *p, u_int length)
 
 
 static int
 
 
 static int

-mgmt_body_print(u_int16_t fc, const struct mgmt_header_t *pmh,
-    const u_char *p, u_int length)
+mgmt_body_print(netdissect_options *ndo,
+                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))));
+
+       /* There may be a problem w/ AP not having this bit set */
+       if (FC_PROTECTED(fc))
+               return wep_print(ndo, p);

        switch (FC_SUBTYPE(fc)) {
        case ST_ASSOC_REQUEST:
        switch (FC_SUBTYPE(fc)) {
        case ST_ASSOC_REQUEST:

-               printf("Assoc Request");
-               return handle_assoc_request(p, length);
+               return handle_assoc_request(ndo, p, length);

        case ST_ASSOC_RESPONSE:
        case ST_ASSOC_RESPONSE:

-               printf("Assoc Response");
-               return handle_assoc_response(p, length);
+               return handle_assoc_response(ndo, p, length);

        case ST_REASSOC_REQUEST:
        case ST_REASSOC_REQUEST:

-               printf("ReAssoc Request");
-               return handle_reassoc_request(p, length);
+               return handle_reassoc_request(ndo, p, length);

        case ST_REASSOC_RESPONSE:
        case ST_REASSOC_RESPONSE:

-               printf("ReAssoc Response");
-               return handle_reassoc_response(p, length);
+               return handle_reassoc_response(ndo, p, length);

        case ST_PROBE_REQUEST:
        case ST_PROBE_REQUEST:

-               printf("Probe Request");
-               return handle_probe_request(p, length);
+               return handle_probe_request(ndo, p, length);

        case ST_PROBE_RESPONSE:
        case ST_PROBE_RESPONSE:

-               printf("Probe Response");
-               return handle_probe_response(p, length);
+               return handle_probe_response(ndo, p, length);

        case ST_BEACON:
        case ST_BEACON:

-               printf("Beacon");
-               return handle_beacon(p, length);
+               return handle_beacon(ndo, p, length);

        case ST_ATIM:
        case ST_ATIM:

-               printf("ATIM");

                return handle_atim();
        case ST_DISASSOC:
                return handle_atim();
        case ST_DISASSOC:

-               printf("Disassociation");
-               return handle_disassoc(p, length);
+               return handle_disassoc(ndo, p, length);

        case ST_AUTH:
        case ST_AUTH:

-               printf("Authentication");
-               if (!TTEST2(*p, 3))
-                       return 0;
-               if ((p[0] == 0 ) && (p[1] == 0) && (p[2] == 0)) {
-                       printf("Authentication (Shared-Key)-3 ");
-                       return wep_print(p);
-               }
-               return handle_auth(p, length);
+               return handle_auth(ndo, p, length);

        case ST_DEAUTH:
        case ST_DEAUTH:

-               printf("DeAuthentication");
-               return handle_deauth(pmh, p, length);
-               break;
+               return handle_deauth(ndo, src, p, length);

        case ST_ACTION:
        case ST_ACTION:

-               printf("Action");
-               return handle_action(pmh, p, length);
-               break;
+               return handle_action(ndo, src, p, length);

        default:
        default:

-               printf("Unhandled Management subtype(%x)",
-                   FC_SUBTYPE(fc));

                return 1;
        }
 }
                return 1;
        }
 }


@@ -1961,89 +1976,76 @@ mgmt_body_print(u_int16_t fc, const struct mgmt_header_t *pmh,
  *********************************************************************************/
 
 static int
  *********************************************************************************/
 
 static int

-ctrl_body_print(u_int16_t fc, const u_char *p)
+ctrl_body_print(netdissect_options *ndo,
+                uint16_t fc, const u_char *p)

 {
 {

+       ND_PRINT((ndo, "%s", tok2str(ctrl_str, "Unknown Ctrl Subtype", FC_SUBTYPE(fc))));

        switch (FC_SUBTYPE(fc)) {
        case CTRL_CONTROL_WRAPPER:
        switch (FC_SUBTYPE(fc)) {
        case CTRL_CONTROL_WRAPPER:

-               printf("Control Wrapper");

                /* XXX - requires special handling */
                break;
        case CTRL_BAR:
                /* XXX - requires special handling */
                break;
        case CTRL_BAR:

-               printf("BAR");
-               if (!TTEST2(*p, CTRL_BAR_HDRLEN))
+               if (!ND_TTEST2(*p, CTRL_BAR_HDRLEN))

                        return 0;
                        return 0;

-               if (!eflag)
-                       printf(" RA:%s TA:%s CTL(%x) SEQ(%u) ",
-                           etheraddr_string(((const struct ctrl_bar_t *)p)->ra),
-                           etheraddr_string(((const struct ctrl_bar_t *)p)->ta),
-                           EXTRACT_LE_16BITS(&(((const struct ctrl_bar_t *)p)->ctl)),
-                           EXTRACT_LE_16BITS(&(((const struct ctrl_bar_t *)p)->seq)));
+               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))));

                break;
        case CTRL_BA:
                break;
        case CTRL_BA:

-               printf("BA");
-               if (!TTEST2(*p, CTRL_BA_HDRLEN))
+               if (!ND_TTEST2(*p, CTRL_BA_HDRLEN))

                        return 0;
                        return 0;

-               if (!eflag)
-                       printf(" RA:%s ",
-                           etheraddr_string(((const struct ctrl_ba_t *)p)->ra));
+               if (!ndo->ndo_eflag)
+                       ND_PRINT((ndo, " RA:%s ",
+                           etheraddr_string(ndo, ((const struct ctrl_ba_hdr_t *)p)->ra)));

                break;
        case CTRL_PS_POLL:
                break;
        case CTRL_PS_POLL:

-               printf("Power Save-Poll");
-               if (!TTEST2(*p, CTRL_PS_POLL_HDRLEN))
+               if (!ND_TTEST2(*p, CTRL_PS_POLL_HDRLEN))

                        return 0;
                        return 0;

-               printf(" AID(%x)",
-                   EXTRACT_LE_16BITS(&(((const struct ctrl_ps_poll_t *)p)->aid)));
+               ND_PRINT((ndo, " AID(%x)",
+                   EXTRACT_LE_16BITS(&(((const struct ctrl_ps_poll_hdr_t *)p)->aid))));

                break;
        case CTRL_RTS:
                break;
        case CTRL_RTS:

-               printf("Request-To-Send");
-               if (!TTEST2(*p, CTRL_RTS_HDRLEN))
+               if (!ND_TTEST2(*p, CTRL_RTS_HDRLEN))

                        return 0;
                        return 0;

-               if (!eflag)
-                       printf(" TA:%s ",
-                           etheraddr_string(((const struct ctrl_rts_t *)p)->ta));
+               if (!ndo->ndo_eflag)
+                       ND_PRINT((ndo, " TA:%s ",
+                           etheraddr_string(ndo, ((const struct ctrl_rts_hdr_t *)p)->ta)));

                break;
        case CTRL_CTS:
                break;
        case CTRL_CTS:

-               printf("Clear-To-Send");
-               if (!TTEST2(*p, CTRL_CTS_HDRLEN))
+               if (!ND_TTEST2(*p, CTRL_CTS_HDRLEN))

                        return 0;
                        return 0;

-               if (!eflag)
-                       printf(" RA:%s ",
-                           etheraddr_string(((const struct ctrl_cts_t *)p)->ra));
+               if (!ndo->ndo_eflag)
+                       ND_PRINT((ndo, " RA:%s ",
+                           etheraddr_string(ndo, ((const struct ctrl_cts_hdr_t *)p)->ra)));

                break;
        case CTRL_ACK:
                break;
        case CTRL_ACK:

-               printf("Acknowledgment");
-               if (!TTEST2(*p, CTRL_ACK_HDRLEN))
+               if (!ND_TTEST2(*p, CTRL_ACK_HDRLEN))

                        return 0;
                        return 0;

-               if (!eflag)
-                       printf(" RA:%s ",
-                           etheraddr_string(((const struct ctrl_ack_t *)p)->ra));
+               if (!ndo->ndo_eflag)
+                       ND_PRINT((ndo, " RA:%s ",
+                           etheraddr_string(ndo, ((const struct ctrl_ack_hdr_t *)p)->ra)));

                break;
        case CTRL_CF_END:
                break;
        case CTRL_CF_END:

-               printf("CF-End");
-               if (!TTEST2(*p, CTRL_END_HDRLEN))
+               if (!ND_TTEST2(*p, CTRL_END_HDRLEN))

                        return 0;
                        return 0;

-               if (!eflag)
-                       printf(" RA:%s ",
-                           etheraddr_string(((const struct ctrl_end_t *)p)->ra));
+               if (!ndo->ndo_eflag)
+                       ND_PRINT((ndo, " RA:%s ",
+                           etheraddr_string(ndo, ((const struct ctrl_end_hdr_t *)p)->ra)));

                break;
        case CTRL_END_ACK:
                break;
        case CTRL_END_ACK:

-               printf("CF-End+CF-Ack");
-               if (!TTEST2(*p, CTRL_END_ACK_HDRLEN))
+               if (!ND_TTEST2(*p, CTRL_END_ACK_HDRLEN))

                        return 0;
                        return 0;

-               if (!eflag)
-                       printf(" RA:%s ",
-                           etheraddr_string(((const struct ctrl_end_ack_t *)p)->ra));
+               if (!ndo->ndo_eflag)
+                       ND_PRINT((ndo, " RA:%s ",
+                           etheraddr_string(ndo, ((const struct ctrl_end_ack_hdr_t *)p)->ra)));

                break;
                break;

-       default:
-               printf("Unknown Ctrl Subtype");

        }
        return 1;
 }
 
        }
        return 1;
 }
 

-/*
- * Print Header funcs
- */
-

 /*
  *  Data Frame - Address field contents
  *
 /*
  *  Data Frame - Address field contents
  *


@@ -2054,27 +2056,73 @@ ctrl_body_print(u_int16_t fc, const u_char *p)
  *    1    |  1      |  RA    | TA     | DA     | SA
  */
 
  *    1    |  1      |  RA    | TA     | DA     | SA
  */
 

+/*
+ * Function to get source and destination MAC addresses for a data frame.
+ */

 static void
 static void

-data_header_print(u_int16_t fc, const u_char *p, const u_int8_t **srcp,
-    const u_int8_t **dstp)
+get_data_src_dst_mac(uint16_t fc, const u_char *p, const uint8_t **srcp,
+                     const uint8_t **dstp)
+{
+#define ADDR1  (p + 4)
+#define ADDR2  (p + 10)
+#define ADDR3  (p + 16)
+#define ADDR4  (p + 24)
+
+       if (!FC_TO_DS(fc) && !FC_FROM_DS(fc)) {
+               *srcp = ADDR2;
+               *dstp = ADDR1;
+       } else if (!FC_TO_DS(fc) && FC_FROM_DS(fc)) {
+               *srcp = ADDR3;
+               *dstp = ADDR1;
+       } else if (FC_TO_DS(fc) && !FC_FROM_DS(fc)) {
+               *srcp = ADDR2;
+               *dstp = ADDR3;
+       } else if (FC_TO_DS(fc) && FC_FROM_DS(fc)) {
+               *srcp = ADDR4;
+               *dstp = ADDR3;
+       }
+
+#undef ADDR1
+#undef ADDR2
+#undef ADDR3
+#undef ADDR4
+}
+
+static void
+get_mgmt_src_dst_mac(const u_char *p, const uint8_t **srcp, const uint8_t **dstp)
+{
+       const struct mgmt_header_t *hp = (const struct mgmt_header_t *) p;
+
+       if (srcp != NULL)
+               *srcp = hp->sa;
+       if (dstp != NULL)
+               *dstp = hp->da;
+}
+
+/*
+ * Print Header funcs
+ */
+
+static void
+data_header_print(netdissect_options *ndo, uint16_t fc, const u_char *p)

 {
        u_int subtype = FC_SUBTYPE(fc);
 
        if (DATA_FRAME_IS_CF_ACK(subtype) || DATA_FRAME_IS_CF_POLL(subtype) ||
            DATA_FRAME_IS_QOS(subtype)) {
 {
        u_int subtype = FC_SUBTYPE(fc);
 
        if (DATA_FRAME_IS_CF_ACK(subtype) || DATA_FRAME_IS_CF_POLL(subtype) ||
            DATA_FRAME_IS_QOS(subtype)) {

-               printf("CF ");
+               ND_PRINT((ndo, "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))

-                               printf("Ack/Poll");
+                               ND_PRINT((ndo, "Ack/Poll"));

                        else
                        else

-                               printf("Ack");
+                               ND_PRINT((ndo, "Ack"));

                } else {
                        if (DATA_FRAME_IS_CF_POLL(subtype))
                } else {
                        if (DATA_FRAME_IS_CF_POLL(subtype))

-                               printf("Poll");
+                               ND_PRINT((ndo, "Poll"));

                }
                if (DATA_FRAME_IS_QOS(subtype))
                }
                if (DATA_FRAME_IS_QOS(subtype))

-                       printf("+QoS");
-               printf(" ");
+                       ND_PRINT((ndo, "+QoS"));
+               ND_PRINT((ndo, " "));

        }
 
 #define ADDR1  (p + 4)
        }
 
 #define ADDR1  (p + 4)


@@ -2083,45 +2131,21 @@ data_header_print(u_int16_t fc, const u_char *p, const u_int8_t **srcp,
 #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)) {

-               if (srcp != NULL)
-                       *srcp = ADDR2;
-               if (dstp != NULL)
-                       *dstp = ADDR1;
-               if (!eflag)
-                       return;
-               printf("DA:%s SA:%s BSSID:%s ",
-                   etheraddr_string(ADDR1), etheraddr_string(ADDR2),
-                   etheraddr_string(ADDR3));
+               ND_PRINT((ndo, "DA:%s SA:%s BSSID:%s ",
+                   etheraddr_string(ndo, ADDR1), etheraddr_string(ndo, ADDR2),
+                   etheraddr_string(ndo, ADDR3)));

        } else if (!FC_TO_DS(fc) && FC_FROM_DS(fc)) {
        } else if (!FC_TO_DS(fc) && FC_FROM_DS(fc)) {

-               if (srcp != NULL)
-                       *srcp = ADDR3;
-               if (dstp != NULL)
-                       *dstp = ADDR1;
-               if (!eflag)
-                       return;
-               printf("DA:%s BSSID:%s SA:%s ",
-                   etheraddr_string(ADDR1), etheraddr_string(ADDR2),
-                   etheraddr_string(ADDR3));
+               ND_PRINT((ndo, "DA:%s BSSID:%s SA:%s ",
+                   etheraddr_string(ndo, ADDR1), etheraddr_string(ndo, ADDR2),
+                   etheraddr_string(ndo, ADDR3)));

        } else if (FC_TO_DS(fc) && !FC_FROM_DS(fc)) {
        } else if (FC_TO_DS(fc) && !FC_FROM_DS(fc)) {

-               if (srcp != NULL)
-                       *srcp = ADDR2;
-               if (dstp != NULL)
-                       *dstp = ADDR3;
-               if (!eflag)
-                       return;
-               printf("BSSID:%s SA:%s DA:%s ",
-                   etheraddr_string(ADDR1), etheraddr_string(ADDR2),
-                   etheraddr_string(ADDR3));
+               ND_PRINT((ndo, "BSSID:%s SA:%s DA:%s ",
+                   etheraddr_string(ndo, ADDR1), etheraddr_string(ndo, ADDR2),
+                   etheraddr_string(ndo, ADDR3)));

        } else if (FC_TO_DS(fc) && FC_FROM_DS(fc)) {
        } else if (FC_TO_DS(fc) && FC_FROM_DS(fc)) {

-               if (srcp != NULL)
-                       *srcp = ADDR4;
-               if (dstp != NULL)
-                       *dstp = ADDR3;
-               if (!eflag)
-                       return;
-               printf("RA:%s TA:%s DA:%s SA:%s ",
-                   etheraddr_string(ADDR1), etheraddr_string(ADDR2),
-                   etheraddr_string(ADDR3), etheraddr_string(ADDR4));
+               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)));

        }
 
 #undef ADDR1
        }
 
 #undef ADDR1


@@ -2131,82 +2155,67 @@ data_header_print(u_int16_t fc, const u_char *p, const u_int8_t **srcp,
 }
 
 static void
 }
 
 static void

-mgmt_header_print(const u_char *p, const u_int8_t **srcp,
-    const u_int8_t **dstp)
+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;
 

-       if (srcp != NULL)
-               *srcp = hp->sa;
-       if (dstp != NULL)
-               *dstp = hp->da;
-       if (!eflag)
-               return;
-
-       printf("BSSID:%s DA:%s SA:%s ",
-           etheraddr_string((hp)->bssid), etheraddr_string((hp)->da),
-           etheraddr_string((hp)->sa));
+       ND_PRINT((ndo, "BSSID:%s DA:%s SA:%s ",
+           etheraddr_string(ndo, (hp)->bssid), etheraddr_string(ndo, (hp)->da),
+           etheraddr_string(ndo, (hp)->sa)));

 }
 
 static void
 }
 
 static void

-ctrl_header_print(u_int16_t fc, const u_char *p, const u_int8_t **srcp,
-    const u_int8_t **dstp)
+ctrl_header_print(netdissect_options *ndo, uint16_t fc, const u_char *p)

 {
 {

-       if (srcp != NULL)
-               *srcp = NULL;
-       if (dstp != NULL)
-               *dstp = NULL;
-       if (!eflag)
-               return;
-

        switch (FC_SUBTYPE(fc)) {
        case CTRL_BAR:
        switch (FC_SUBTYPE(fc)) {
        case CTRL_BAR:

-               printf(" RA:%s TA:%s CTL(%x) SEQ(%u) ",
-                   etheraddr_string(((const struct ctrl_bar_t *)p)->ra),
-                   etheraddr_string(((const struct ctrl_bar_t *)p)->ta),
-                   EXTRACT_LE_16BITS(&(((const struct ctrl_bar_t *)p)->ctl)),
-                   EXTRACT_LE_16BITS(&(((const struct ctrl_bar_t *)p)->seq)));
+               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))));

                break;
        case CTRL_BA:
                break;
        case CTRL_BA:

-               printf("RA:%s ",
-                   etheraddr_string(((const struct ctrl_ba_t *)p)->ra));
+               ND_PRINT((ndo, "RA:%s ",
+                   etheraddr_string(ndo, ((const struct ctrl_ba_hdr_t *)p)->ra)));

                break;
        case CTRL_PS_POLL:
                break;
        case CTRL_PS_POLL:

-               printf("BSSID:%s TA:%s ",
-                   etheraddr_string(((const struct ctrl_ps_poll_t *)p)->bssid),
-                   etheraddr_string(((const struct ctrl_ps_poll_t *)p)->ta));
+               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)));

                break;
        case CTRL_RTS:
                break;
        case CTRL_RTS:

-               printf("RA:%s TA:%s ",
-                   etheraddr_string(((const struct ctrl_rts_t *)p)->ra),
-                   etheraddr_string(((const struct ctrl_rts_t *)p)->ta));
+               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)));

                break;
        case CTRL_CTS:
                break;
        case CTRL_CTS:

-               printf("RA:%s ",
-                   etheraddr_string(((const struct ctrl_cts_t *)p)->ra));
+               ND_PRINT((ndo, "RA:%s ",
+                   etheraddr_string(ndo, ((const struct ctrl_cts_hdr_t *)p)->ra)));

                break;
        case CTRL_ACK:
                break;
        case CTRL_ACK:

-               printf("RA:%s ",
-                   etheraddr_string(((const struct ctrl_ack_t *)p)->ra));
+               ND_PRINT((ndo, "RA:%s ",
+                   etheraddr_string(ndo, ((const struct ctrl_ack_hdr_t *)p)->ra)));

                break;
        case CTRL_CF_END:
                break;
        case CTRL_CF_END:

-               printf("RA:%s BSSID:%s ",
-                   etheraddr_string(((const struct ctrl_end_t *)p)->ra),
-                   etheraddr_string(((const struct ctrl_end_t *)p)->bssid));
+               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)));

                break;
        case CTRL_END_ACK:
                break;
        case CTRL_END_ACK:

-               printf("RA:%s BSSID:%s ",
-                   etheraddr_string(((const struct ctrl_end_ack_t *)p)->ra),
-                   etheraddr_string(((const struct ctrl_end_ack_t *)p)->bssid));
+               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)));

                break;
        default:
                break;
        default:

-               printf("(H) Unknown Ctrl Subtype");
+               /* We shouldn't get here - we should already have quit */

                break;
        }
 }
 
 static int
                break;
        }
 }
 
 static int

-extract_header_length(u_int16_t fc)
+extract_header_length(netdissect_options *ndo,
+                      uint16_t fc)

 {
        int len;
 
 {
        int len;
 


@@ -2215,8 +2224,12 @@ extract_header_length(u_int16_t fc)
                return MGMT_HDRLEN;
        case T_CTRL:
                switch (FC_SUBTYPE(fc)) {
                return MGMT_HDRLEN;
        case T_CTRL:
                switch (FC_SUBTYPE(fc)) {

+               case CTRL_CONTROL_WRAPPER:
+                       return CTRL_CONTROL_WRAPPER_HDRLEN;

                case CTRL_BAR:
                        return CTRL_BAR_HDRLEN;
                case CTRL_BAR:
                        return CTRL_BAR_HDRLEN;

+               case CTRL_BA:
+                       return CTRL_BA_HDRLEN;

                case CTRL_PS_POLL:
                        return CTRL_PS_POLL_HDRLEN;
                case CTRL_RTS:
                case CTRL_PS_POLL:
                        return CTRL_PS_POLL_HDRLEN;
                case CTRL_RTS:


@@ -2230,6 +2243,7 @@ extract_header_length(u_int16_t fc)
                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)));

                        return 0;
                }
        case T_DATA:
                        return 0;
                }
        case T_DATA:


@@ -2238,7 +2252,7 @@ extract_header_length(u_int16_t fc)
                        len += 2;
                return len;
        default:
                        len += 2;
                return len;
        default:

-               printf("unknown IEEE802.11 frame type (%d)", FC_TYPE(fc));
+               ND_PRINT((ndo, "unknown 802.11 frame type (%d)", FC_TYPE(fc)));

                return 0;
        }
 }
                return 0;
        }
 }


@@ -2250,63 +2264,58 @@ extract_mesh_header_length(const u_char *p)
 }
 
 /*
 }
 
 /*

- * Print the 802.11 MAC header if eflag is set, and set "*srcp" and "*dstp"
- * to point to the source and destination MAC addresses in any case if
- * "srcp" and "dstp" aren't null.
+ * Print the 802.11 MAC header.

  */
 static void
  */
 static void

-ieee_802_11_hdr_print(u_int16_t fc, const u_char *p, u_int hdrlen,
-    u_int meshdrlen, const u_int8_t **srcp, const u_int8_t **dstp)
+ieee_802_11_hdr_print(netdissect_options *ndo,
+                      uint16_t fc, const u_char *p, u_int hdrlen,
+                      u_int meshdrlen)

 {
 {

-       if (vflag) {
+       if (ndo->ndo_vflag) {

                if (FC_MORE_DATA(fc))
                if (FC_MORE_DATA(fc))

-                       printf("More Data ");
+                       ND_PRINT((ndo, "More Data "));

                if (FC_MORE_FLAG(fc))
                if (FC_MORE_FLAG(fc))

-                       printf("More Fragments ");
+                       ND_PRINT((ndo, "More Fragments "));

                if (FC_POWER_MGMT(fc))
                if (FC_POWER_MGMT(fc))

-                       printf("Pwr Mgmt ");
+                       ND_PRINT((ndo, "Pwr Mgmt "));

                if (FC_RETRY(fc))
                if (FC_RETRY(fc))

-                       printf("Retry ");
+                       ND_PRINT((ndo, "Retry "));

                if (FC_ORDER(fc))
                if (FC_ORDER(fc))

-                       printf("Strictly Ordered ");
-               if (FC_WEP(fc))
-                       printf("WEP Encrypted ");
+                       ND_PRINT((ndo, "Strictly Ordered "));
+               if (FC_PROTECTED(fc))
+                       ND_PRINT((ndo, "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)

-                       printf("%dus ",
+                       ND_PRINT((ndo, "%dus ",

                            EXTRACT_LE_16BITS(
                            EXTRACT_LE_16BITS(

-                               &((const struct mgmt_header_t *)p)->duration));
+                               &((const struct mgmt_header_t *)p)->duration)));

        }
        if (meshdrlen != 0) {
                const struct meshcntl_t *mc =
                    (const struct meshcntl_t *)&p[hdrlen - meshdrlen];
                int ae = mc->flags & 3;
 
        }
        if (meshdrlen != 0) {
                const struct meshcntl_t *mc =
                    (const struct meshcntl_t *)&p[hdrlen - meshdrlen];
                int ae = mc->flags & 3;
 

-               printf("MeshData (AE %d TTL %u seq %u", ae, mc->ttl,
-                   EXTRACT_LE_32BITS(mc->seq));
+               ND_PRINT((ndo, "MeshData (AE %d TTL %u seq %u", ae, mc->ttl,
+                   EXTRACT_LE_32BITS(mc->seq)));

                if (ae > 0)
                if (ae > 0)

-                       printf(" A4:%s", etheraddr_string(mc->addr4));
+                       ND_PRINT((ndo, " A4:%s", etheraddr_string(ndo, mc->addr4)));

                if (ae > 1)
                if (ae > 1)

-                       printf(" A5:%s", etheraddr_string(mc->addr5));
+                       ND_PRINT((ndo, " A5:%s", etheraddr_string(ndo, mc->addr5)));

                if (ae > 2)
                if (ae > 2)

-                       printf(" A6:%s", etheraddr_string(mc->addr6));
-               printf(") ");
+                       ND_PRINT((ndo, " A6:%s", etheraddr_string(ndo, mc->addr6)));
+               ND_PRINT((ndo, ") "));

        }
 
        switch (FC_TYPE(fc)) {
        case T_MGMT:
        }
 
        switch (FC_TYPE(fc)) {
        case T_MGMT:

-               mgmt_header_print(p, srcp, dstp);
+               mgmt_header_print(ndo, p);

                break;
        case T_CTRL:
                break;
        case T_CTRL:

-               ctrl_header_print(fc, p, srcp, dstp);
+               ctrl_header_print(ndo, fc, p);

                break;
        case T_DATA:
                break;
        case T_DATA:

-               data_header_print(fc, p, srcp, dstp);
+               data_header_print(ndo, fc, p);

                break;
        default:
                break;
        default:

-               printf("(header) unknown IEEE802.11 frame type (%d)",
-                   FC_TYPE(fc));
-               *srcp = NULL;
-               *dstp = NULL;

                break;
        }
 }
                break;
        }
 }


@@ -2316,18 +2325,19 @@ ieee_802_11_hdr_print(u_int16_t fc, const u_char *p, u_int hdrlen,
 #endif
 
 static u_int
 #endif
 
 static u_int

-ieee802_11_print(const u_char *p, u_int length, u_int orig_caplen, int pad,
-    u_int fcslen)
+ieee802_11_print(netdissect_options *ndo,
+                 const u_char *p, u_int length, u_int orig_caplen, int pad,
+                 u_int fcslen)

 {
 {

-       u_int16_t fc;
+       uint16_t fc;

        u_int caplen, hdrlen, meshdrlen;
        u_int caplen, hdrlen, meshdrlen;

-       const u_int8_t *src, *dst;
-       u_short extracted_ethertype;
+       const uint8_t *src, *dst;
+       int llc_hdrlen;

 
        caplen = orig_caplen;
        /* Remove FCS, if present */
        if (length < fcslen) {
 
        caplen = orig_caplen;
        /* Remove FCS, if present */
        if (length < fcslen) {

-               printf("%s", tstr);
+               ND_PRINT((ndo, "%s", tstr));

                return caplen;
        }
        length -= fcslen;
                return caplen;
        }
        length -= fcslen;


@@ -2335,32 +2345,36 @@ ieee802_11_print(const u_char *p, u_int length, u_int orig_caplen, int pad,
                /* Amount of FCS in actual packet data, if any */
                fcslen = caplen - length;
                caplen -= fcslen;
                /* Amount of FCS in actual packet data, if any */
                fcslen = caplen - length;
                caplen -= fcslen;

-               snapend -= fcslen;
+               ndo->ndo_snapend -= fcslen;

        }
 
        if (caplen < IEEE802_11_FC_LEN) {
        }
 
        if (caplen < IEEE802_11_FC_LEN) {

-               printf("%s", tstr);
+               ND_PRINT((ndo, "%s", tstr));

                return orig_caplen;
        }
 
        fc = EXTRACT_LE_16BITS(p);
                return orig_caplen;
        }
 
        fc = EXTRACT_LE_16BITS(p);

-       hdrlen = extract_header_length(fc);
+       hdrlen = extract_header_length(ndo, fc);
+       if (hdrlen == 0) {
+               /* Unknown frame type or control frame subtype; quit. */
+               return (0);
+       }

        if (pad)
                hdrlen = roundup2(hdrlen, 4);
        if (pad)
                hdrlen = roundup2(hdrlen, 4);

-       if (Hflag && FC_TYPE(fc) == T_DATA &&
+       if (ndo->ndo_Hflag && FC_TYPE(fc) == T_DATA &&

            DATA_FRAME_IS_QOS(FC_SUBTYPE(fc))) {
                meshdrlen = extract_mesh_header_length(p+hdrlen);
                hdrlen += meshdrlen;
        } else
                meshdrlen = 0;
 
            DATA_FRAME_IS_QOS(FC_SUBTYPE(fc))) {
                meshdrlen = extract_mesh_header_length(p+hdrlen);
                hdrlen += meshdrlen;
        } else
                meshdrlen = 0;
 

-

        if (caplen < hdrlen) {
        if (caplen < hdrlen) {

-               printf("%s", tstr);
+               ND_PRINT((ndo, "%s", tstr));

                return hdrlen;
        }
 
                return hdrlen;
        }
 

-       ieee_802_11_hdr_print(fc, p, hdrlen, meshdrlen, &src, &dst);
+       if (ndo->ndo_eflag)
+               ieee_802_11_hdr_print(ndo, fc, p, hdrlen, meshdrlen);

 
        /*
         * Go past the 802.11 header.
 
        /*
         * Go past the 802.11 header.


@@ -2371,15 +2385,15 @@ ieee802_11_print(const u_char *p, u_int length, u_int orig_caplen, int pad,
 
        switch (FC_TYPE(fc)) {
        case T_MGMT:
 
        switch (FC_TYPE(fc)) {
        case T_MGMT:

-               if (!mgmt_body_print(fc,
-                   (const struct mgmt_header_t *)(p - hdrlen), p, length)) {
-                       printf("%s", tstr);
+               get_mgmt_src_dst_mac(p - hdrlen, &src, &dst);
+               if (!mgmt_body_print(ndo, fc, src, p, length)) {
+                       ND_PRINT((ndo, "%s", tstr));

                        return hdrlen;
                }
                break;
        case T_CTRL:
                        return hdrlen;
                }
                break;
        case T_CTRL:

-               if (!ctrl_body_print(fc, p - hdrlen)) {
-                       printf("%s", tstr);
+               if (!ctrl_body_print(ndo, fc, p - hdrlen)) {
+                       ND_PRINT((ndo, "%s", tstr));

                        return hdrlen;
                }
                break;
                        return hdrlen;
                }
                break;


@@ -2387,30 +2401,29 @@ ieee802_11_print(const u_char *p, u_int length, u_int orig_caplen, int pad,
                if (DATA_FRAME_IS_NULL(FC_SUBTYPE(fc)))
                        return hdrlen;  /* no-data frame */
                /* There may be a problem w/ AP not having this bit set */
                if (DATA_FRAME_IS_NULL(FC_SUBTYPE(fc)))
                        return hdrlen;  /* no-data frame */
                /* There may be a problem w/ AP not having this bit set */

-               if (FC_WEP(fc)) {
-                       if (!wep_print(p)) {
-                               printf("%s", tstr);
+               if (FC_PROTECTED(fc)) {
+                       ND_PRINT((ndo, "Data"));
+                       if (!wep_print(ndo, p)) {
+                               ND_PRINT((ndo, "%s", tstr));

                                return hdrlen;
                        }
                                return hdrlen;
                        }

-               } else if (llc_print(gndo, p, length, caplen, dst, src,
-                   &extracted_ethertype) == 0) {
-                       /*
-                        * Some kinds of LLC packet we cannot
-                        * handle intelligently
-                        */
-                       if (!eflag)
-                               ieee_802_11_hdr_print(fc, p - hdrlen, hdrlen,
-                                   meshdrlen, NULL, NULL);
-                       if (extracted_ethertype)
-                               printf("(LLC %s) ",
-                                   etherproto_string(
-                                       htons(extracted_ethertype)));
-                       if (!suppress_default_print)
-                               default_print(p, caplen);
+               } else {
+                       get_data_src_dst_mac(fc, p - hdrlen, &src, &dst);
+                       llc_hdrlen = llc_print(ndo, p, length, caplen, dst, src);
+                       if (llc_hdrlen < 0) {
+                               /*
+                                * Some kinds of LLC packet we cannot
+                                * handle intelligently
+                                */
+                               if (!ndo->ndo_suppress_default_print)
+                                       ND_DEFAULTPRINT(p, caplen);
+                               llc_hdrlen = -llc_hdrlen;
+                       }
+                       hdrlen += llc_hdrlen;

                }
                break;
        default:
                }
                break;
        default:

-               printf("unknown 802.11 frame type (%d)", FC_TYPE(fc));
+               /* We shouldn't get here - we should already have quit */

                break;
        }
 
                break;
        }
 


@@ -2424,9 +2437,10 @@ ieee802_11_print(const u_char *p, u_int length, u_int orig_caplen, int pad,
  * is the number of bytes actually captured.
  */
 u_int
  * is the number of bytes actually captured.
  */
 u_int

-ieee802_11_if_print(const struct pcap_pkthdr *h, const u_char *p)
+ieee802_11_if_print(netdissect_options *ndo,
+                    const struct pcap_pkthdr *h, const u_char *p)

 {
 {

-       return ieee802_11_print(p, h->len, h->caplen, 0, 0);
+       return ieee802_11_print(ndo, p, h->len, h->caplen, 0, 0);

 }
 
 #define        IEEE80211_CHAN_FHSS \
 }
 
 #define        IEEE80211_CHAN_FHSS \


@@ -2454,50 +2468,52 @@ ieee802_11_if_print(const struct pcap_pkthdr *h, const u_char *p)
        (IS_CHAN_PUREG(flags) || IS_CHAN_G(flags))
 
 static void
        (IS_CHAN_PUREG(flags) || IS_CHAN_G(flags))
 
 static void

-print_chaninfo(int freq, int flags)
+print_chaninfo(netdissect_options *ndo,
+               int freq, int flags)

 {
 {

-       printf("%u MHz", freq);
+       ND_PRINT((ndo, "%u MHz", freq));

        if (IS_CHAN_FHSS(flags))
        if (IS_CHAN_FHSS(flags))

-               printf(" FHSS");
+               ND_PRINT((ndo, " FHSS"));

        if (IS_CHAN_A(flags)) {
                if (flags & IEEE80211_CHAN_HALF)
        if (IS_CHAN_A(flags)) {
                if (flags & IEEE80211_CHAN_HALF)

-                       printf(" 11a/10Mhz");
+                       ND_PRINT((ndo, " 11a/10Mhz"));

                else if (flags & IEEE80211_CHAN_QUARTER)
                else if (flags & IEEE80211_CHAN_QUARTER)

-                       printf(" 11a/5Mhz");
+                       ND_PRINT((ndo, " 11a/5Mhz"));

                else
                else

-                       printf(" 11a");
+                       ND_PRINT((ndo, " 11a"));

        }
        if (IS_CHAN_ANYG(flags)) {
                if (flags & IEEE80211_CHAN_HALF)
        }
        if (IS_CHAN_ANYG(flags)) {
                if (flags & IEEE80211_CHAN_HALF)

-                       printf(" 11g/10Mhz");
+                       ND_PRINT((ndo, " 11g/10Mhz"));

                else if (flags & IEEE80211_CHAN_QUARTER)
                else if (flags & IEEE80211_CHAN_QUARTER)

-                       printf(" 11g/5Mhz");
+                       ND_PRINT((ndo, " 11g/5Mhz"));

                else
                else

-                       printf(" 11g");
+                       ND_PRINT((ndo, " 11g"));

        } else if (IS_CHAN_B(flags))
        } else if (IS_CHAN_B(flags))

-               printf(" 11b");
+               ND_PRINT((ndo, " 11b"));

        if (flags & IEEE80211_CHAN_TURBO)
        if (flags & IEEE80211_CHAN_TURBO)

-               printf(" Turbo");
+               ND_PRINT((ndo, " Turbo"));

        if (flags & IEEE80211_CHAN_HT20)
        if (flags & IEEE80211_CHAN_HT20)

-               printf(" ht/20");
+               ND_PRINT((ndo, " ht/20"));

        else if (flags & IEEE80211_CHAN_HT40D)
        else if (flags & IEEE80211_CHAN_HT40D)

-               printf(" ht/40-");
+               ND_PRINT((ndo, " ht/40-"));

        else if (flags & IEEE80211_CHAN_HT40U)
        else if (flags & IEEE80211_CHAN_HT40U)

-               printf(" ht/40+");
-       printf(" ");
+               ND_PRINT((ndo, " ht/40+"));
+       ND_PRINT((ndo, " "));

 }
 
 static int
 }
 
 static int

-print_radiotap_field(struct cpack_state *s, u_int32_t bit, u_int8_t *flags,
-                                               struct radiotap_state *state, u_int32_t presentflags)
+print_radiotap_field(netdissect_options *ndo,
+                     struct cpack_state *s, uint32_t bit, uint8_t *flags,
+                     struct radiotap_state *state, uint32_t presentflags)

 {
        union {
                int8_t          i8;
 {
        union {
                int8_t          i8;

-               u_int8_t        u8;
+               uint8_t         u8;

                int16_t         i16;
                int16_t         i16;

-               u_int16_t       u16;
-               u_int32_t       u32;
-               u_int64_t       u64;
+               uint16_t        u16;
+               uint32_t        u32;
+               uint64_t        u64;

        } u, u2, u3, u4;
        int rc;
 
        } u, u2, u3, u4;
        int rc;
 


@@ -2568,9 +2584,9 @@ print_radiotap_field(struct cpack_state *s, u_int32_t bit, u_int8_t *flags,
                rc = cpack_uint8(s, &u3.u8);
                break;
        case IEEE80211_RADIOTAP_VENDOR_NAMESPACE: {
                rc = cpack_uint8(s, &u3.u8);
                break;
        case IEEE80211_RADIOTAP_VENDOR_NAMESPACE: {

-               u_int8_t vns[3];
-               u_int16_t length;
-               u_int8_t subspace;
+               uint8_t vns[3];
+               uint16_t length;
+               uint8_t subspace;

 
                if ((cpack_align_and_reserve(s, 2)) == NULL) {
                        rc = -1;
 
                if ((cpack_align_and_reserve(s, 2)) == NULL) {
                        rc = -1;


@@ -2602,12 +2618,12 @@ print_radiotap_field(struct cpack_state *s, u_int32_t bit, u_int8_t *flags,
                 * size we do not know, so we cannot
                 * proceed.  Just print the bit number.
                 */
                 * size we do not know, so we cannot
                 * proceed.  Just print the bit number.
                 */

-               printf("[bit %u] ", bit);
+               ND_PRINT((ndo, "[bit %u] ", bit));

                return -1;
        }
 
        if (rc != 0) {
                return -1;
        }
 
        if (rc != 0) {

-               printf("%s", tstr);
+               ND_PRINT((ndo, "%s", tstr));

                return rc;
        }
 
                return rc;
        }
 


@@ -2622,10 +2638,10 @@ print_radiotap_field(struct cpack_state *s, u_int32_t bit, u_int8_t *flags,
                 */
                if (presentflags & (1 << IEEE80211_RADIOTAP_XCHANNEL))
                        break;
                 */
                if (presentflags & (1 << IEEE80211_RADIOTAP_XCHANNEL))
                        break;

-               print_chaninfo(u.u16, u2.u16);
+               print_chaninfo(ndo, u.u16, u2.u16);

                break;
        case IEEE80211_RADIOTAP_FHSS:
                break;
        case IEEE80211_RADIOTAP_FHSS:

-               printf("fhset %d fhpat %d ", u.u16 & 0xff, (u.u16 >> 8) & 0xff);
+               ND_PRINT((ndo, "fhset %d fhpat %d ", u.u16 & 0xff, (u.u16 >> 8) & 0xff));

                break;
        case IEEE80211_RADIOTAP_RATE:
                /*
                break;
        case IEEE80211_RADIOTAP_RATE:
                /*


@@ -2666,57 +2682,57 @@ print_radiotap_field(struct cpack_state *s, u_int32_t bit, u_int8_t *flags,
                         * information from Flags, at least on
                         * FreeBSD?
                         */
                         * information from Flags, at least on
                         * FreeBSD?
                         */

-                       printf("MCS %u ", u.u8 & 0x7f);
+                       ND_PRINT((ndo, "MCS %u ", u.u8 & 0x7f));

                } else
                } else

-                       printf("%2.1f Mb/s ", .5*u.u8);
+                       ND_PRINT((ndo, "%2.1f Mb/s ", .5 * u.u8));

                break;
        case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:
                break;
        case IEEE80211_RADIOTAP_DBM_ANTSIGNAL:

-               printf("%ddB signal ", u.i8);
+               ND_PRINT((ndo, "%ddB signal ", u.i8));

                break;
        case IEEE80211_RADIOTAP_DBM_ANTNOISE:
                break;
        case IEEE80211_RADIOTAP_DBM_ANTNOISE:

-               printf("%ddB noise ", u.i8);
+               ND_PRINT((ndo, "%ddB noise ", u.i8));

                break;
        case IEEE80211_RADIOTAP_DB_ANTSIGNAL:
                break;
        case IEEE80211_RADIOTAP_DB_ANTSIGNAL:

-               printf("%ddB signal ", u.u8);
+               ND_PRINT((ndo, "%ddB signal ", u.u8));

                break;
        case IEEE80211_RADIOTAP_DB_ANTNOISE:
                break;
        case IEEE80211_RADIOTAP_DB_ANTNOISE:

-               printf("%ddB noise ", u.u8);
+               ND_PRINT((ndo, "%ddB noise ", u.u8));

                break;
        case IEEE80211_RADIOTAP_LOCK_QUALITY:
                break;
        case IEEE80211_RADIOTAP_LOCK_QUALITY:

-               printf("%u sq ", u.u16);
+               ND_PRINT((ndo, "%u sq ", u.u16));

                break;
        case IEEE80211_RADIOTAP_TX_ATTENUATION:
                break;
        case IEEE80211_RADIOTAP_TX_ATTENUATION:

-               printf("%d tx power ", -(int)u.u16);
+               ND_PRINT((ndo, "%d tx power ", -(int)u.u16));

                break;
        case IEEE80211_RADIOTAP_DB_TX_ATTENUATION:
                break;
        case IEEE80211_RADIOTAP_DB_TX_ATTENUATION:

-               printf("%ddB tx power ", -(int)u.u8);
+               ND_PRINT((ndo, "%ddB tx power ", -(int)u.u8));

                break;
        case IEEE80211_RADIOTAP_DBM_TX_POWER:
                break;
        case IEEE80211_RADIOTAP_DBM_TX_POWER:

-               printf("%ddBm tx power ", u.i8);
+               ND_PRINT((ndo, "%ddBm tx power ", u.i8));

                break;
        case IEEE80211_RADIOTAP_FLAGS:
                if (u.u8 & IEEE80211_RADIOTAP_F_CFP)
                break;
        case IEEE80211_RADIOTAP_FLAGS:
                if (u.u8 & IEEE80211_RADIOTAP_F_CFP)

-                       printf("cfp ");
+                       ND_PRINT((ndo, "cfp "));

                if (u.u8 & IEEE80211_RADIOTAP_F_SHORTPRE)
                if (u.u8 & IEEE80211_RADIOTAP_F_SHORTPRE)

-                       printf("short preamble ");
+                       ND_PRINT((ndo, "short preamble "));

                if (u.u8 & IEEE80211_RADIOTAP_F_WEP)
                if (u.u8 & IEEE80211_RADIOTAP_F_WEP)

-                       printf("wep ");
+                       ND_PRINT((ndo, "wep "));

                if (u.u8 & IEEE80211_RADIOTAP_F_FRAG)
                if (u.u8 & IEEE80211_RADIOTAP_F_FRAG)

-                       printf("fragmented ");
+                       ND_PRINT((ndo, "fragmented "));

                if (u.u8 & IEEE80211_RADIOTAP_F_BADFCS)
                if (u.u8 & IEEE80211_RADIOTAP_F_BADFCS)

-                       printf("bad-fcs ");
+                       ND_PRINT((ndo, "bad-fcs "));

                break;
        case IEEE80211_RADIOTAP_ANTENNA:
                break;
        case IEEE80211_RADIOTAP_ANTENNA:

-               printf("antenna %d ", u.u8);
+               ND_PRINT((ndo, "antenna %d ", u.u8));

                break;
        case IEEE80211_RADIOTAP_TSFT:
                break;
        case IEEE80211_RADIOTAP_TSFT:

-               printf("%" PRIu64 "us tsft ", u.u64);
+               ND_PRINT((ndo, "%" PRIu64 "us tsft ", u.u64));

                break;
        case IEEE80211_RADIOTAP_RX_FLAGS:
                /* Do nothing for now */
                break;
        case IEEE80211_RADIOTAP_XCHANNEL:
                break;
        case IEEE80211_RADIOTAP_RX_FLAGS:
                /* Do nothing for now */
                break;
        case IEEE80211_RADIOTAP_XCHANNEL:

-               print_chaninfo(u2.u16, u.u32);
+               print_chaninfo(ndo, u2.u16, u.u32);

                break;
        case IEEE80211_RADIOTAP_MCS: {
                static const char *bandwidth[4] = {
                break;
        case IEEE80211_RADIOTAP_MCS: {
                static const char *bandwidth[4] = {


@@ -2765,37 +2781,37 @@ print_radiotap_field(struct cpack_state *s, u_int32_t bit, u_int8_t *flags,
                                 * We have the rate.
                                 * Print it.
                                 */
                                 * We have the rate.
                                 * Print it.
                                 */

-                               printf("%.1f Mb/s MCS %u ", htrate, u3.u8);
+                               ND_PRINT((ndo, "%.1f Mb/s MCS %u ", htrate, u3.u8));

                        } else {
                                /*
                                 * We at least have the MCS index.
                                 * Print it.
                                 */
                        } else {
                                /*
                                 * We at least have the MCS index.
                                 * Print it.
                                 */

-                               printf("MCS %u ", u3.u8);
+                               ND_PRINT((ndo, "MCS %u ", u3.u8));

                        }
                }
                if (u.u8 & IEEE80211_RADIOTAP_MCS_BANDWIDTH_KNOWN) {
                        }
                }
                if (u.u8 & IEEE80211_RADIOTAP_MCS_BANDWIDTH_KNOWN) {

-                       printf("%s ",
-                               bandwidth[u2.u8 & IEEE80211_RADIOTAP_MCS_BANDWIDTH_MASK]);
+                       ND_PRINT((ndo, "%s ",
+                               bandwidth[u2.u8 & IEEE80211_RADIOTAP_MCS_BANDWIDTH_MASK]));

                }
                if (u.u8 & IEEE80211_RADIOTAP_MCS_GUARD_INTERVAL_KNOWN) {
                }
                if (u.u8 & IEEE80211_RADIOTAP_MCS_GUARD_INTERVAL_KNOWN) {

-                       printf("%s GI ",
+                       ND_PRINT((ndo, "%s GI ",

                                (u2.u8 & IEEE80211_RADIOTAP_MCS_SHORT_GI) ?
                                (u2.u8 & IEEE80211_RADIOTAP_MCS_SHORT_GI) ?

-                               "short" : "lon");
+                               "short" : "lon"));

                }
                if (u.u8 & IEEE80211_RADIOTAP_MCS_HT_FORMAT_KNOWN) {
                }
                if (u.u8 & IEEE80211_RADIOTAP_MCS_HT_FORMAT_KNOWN) {

-                       printf("%s ",
+                       ND_PRINT((ndo, "%s ",

                                (u2.u8 & IEEE80211_RADIOTAP_MCS_HT_GREENFIELD) ?
                                (u2.u8 & IEEE80211_RADIOTAP_MCS_HT_GREENFIELD) ?

-                               "greenfield" : "mixed");
+                               "greenfield" : "mixed"));

                }
                if (u.u8 & IEEE80211_RADIOTAP_MCS_FEC_TYPE_KNOWN) {
                }
                if (u.u8 & IEEE80211_RADIOTAP_MCS_FEC_TYPE_KNOWN) {

-                       printf("%s FEC ",
+                       ND_PRINT((ndo, "%s FEC ",

                                (u2.u8 & IEEE80211_RADIOTAP_MCS_FEC_LDPC) ?
                                (u2.u8 & IEEE80211_RADIOTAP_MCS_FEC_LDPC) ?

-                               "LDPC" : "BCC");
+                               "LDPC" : "BCC"));

                }
                if (u.u8 & IEEE80211_RADIOTAP_MCS_STBC_KNOWN) {
                }
                if (u.u8 & IEEE80211_RADIOTAP_MCS_STBC_KNOWN) {

-                       printf("RX-STBC%u ",
-                               (u2.u8 & IEEE80211_RADIOTAP_MCS_STBC_MASK) >> IEEE80211_RADIOTAP_MCS_STBC_SHIFT);
+                       ND_PRINT((ndo, "RX-STBC%u ",
+                               (u2.u8 & IEEE80211_RADIOTAP_MCS_STBC_MASK) >> IEEE80211_RADIOTAP_MCS_STBC_SHIFT));

                }
 
                break;
                }
 
                break;


@@ -2805,7 +2821,8 @@ print_radiotap_field(struct cpack_state *s, u_int32_t bit, u_int8_t *flags,
 }
 
 static u_int
 }
 
 static u_int

-ieee802_11_radio_print(const u_char *p, u_int length, u_int caplen)
+ieee802_11_radio_print(netdissect_options *ndo,
+                       const u_char *p, u_int length, u_int caplen)

 {
 #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_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)))


@@ -2818,19 +2835,19 @@ ieee802_11_radio_print(const u_char *p, u_int length, u_int caplen)
 
        struct cpack_state cpacker;
        struct ieee80211_radiotap_header *hdr;
 
        struct cpack_state cpacker;
        struct ieee80211_radiotap_header *hdr;

-       u_int32_t present, next_present;
-       u_int32_t presentflags = 0;
-       u_int32_t *presentp, *last_presentp;
+       uint32_t present, next_present;
+       uint32_t presentflags = 0;
+       uint32_t *presentp, *last_presentp;

        enum ieee80211_radiotap_type bit;
        int bit0;
        u_int len;
        enum ieee80211_radiotap_type bit;
        int bit0;
        u_int len;

-       u_int8_t flags;
+       uint8_t flags;

        int pad;
        u_int fcslen;
        struct radiotap_state state;
 
        if (caplen < sizeof(*hdr)) {
        int pad;
        u_int fcslen;
        struct radiotap_state state;
 
        if (caplen < sizeof(*hdr)) {

-               printf("%s", tstr);
+               ND_PRINT((ndo, "%s", tstr));

                return caplen;
        }
 
                return caplen;
        }
 


@@ -2839,10 +2856,10 @@ ieee802_11_radio_print(const u_char *p, u_int length, u_int caplen)
        len = EXTRACT_LE_16BITS(&hdr->it_len);
 
        if (caplen < len) {
        len = EXTRACT_LE_16BITS(&hdr->it_len);
 
        if (caplen < len) {

-               printf("%s", tstr);
+               ND_PRINT((ndo, "%s", tstr));

                return caplen;
        }
                return caplen;
        }

-       cpack_init(&cpacker, (u_int8_t *)hdr, len); /* align against header start */
+       cpack_init(&cpacker, (uint8_t *)hdr, len); /* align against header start */

        cpack_advance(&cpacker, sizeof(*hdr)); /* includes the 1st bitmap */
        for (last_presentp = &hdr->it_present;
             IS_EXTENDED(last_presentp) &&
        cpack_advance(&cpacker, sizeof(*hdr)); /* includes the 1st bitmap */
        for (last_presentp = &hdr->it_present;
             IS_EXTENDED(last_presentp) &&


@@ -2852,7 +2869,7 @@ ieee802_11_radio_print(const u_char *p, u_int length, u_int caplen)
 
        /* are there more bitmap extensions than bytes in header? */
        if (IS_EXTENDED(last_presentp)) {
 
        /* are there more bitmap extensions than bytes in header? */
        if (IS_EXTENDED(last_presentp)) {

-               printf("%s", tstr);
+               ND_PRINT((ndo, "%s", tstr));

                return caplen;
        }
 
                return caplen;
        }
 


@@ -2878,7 +2895,7 @@ ieee802_11_radio_print(const u_char *p, u_int length, u_int caplen)
                        bit = (enum ieee80211_radiotap_type)
                            (bit0 + BITNO_32(present ^ next_present));
 
                        bit = (enum ieee80211_radiotap_type)
                            (bit0 + BITNO_32(present ^ next_present));
 

-                       if (print_radiotap_field(&cpacker, bit, &flags, &state, presentflags) != 0)
+                       if (print_radiotap_field(ndo, &cpacker, bit, &flags, &state, presentflags) != 0)

                                goto out;
                }
        }
                                goto out;
                }
        }


@@ -2888,7 +2905,7 @@ out:
                pad = 1;        /* Atheros padding */
        if (flags & IEEE80211_RADIOTAP_F_FCS)
                fcslen = 4;     /* FCS at end of packet */
                pad = 1;        /* Atheros padding */
        if (flags & IEEE80211_RADIOTAP_F_FCS)
                fcslen = 4;     /* FCS at end of packet */

-       return len + ieee802_11_print(p + len, length - len, caplen - len, pad,
+       return len + ieee802_11_print(ndo, p + len, length - len, caplen - len, pad,

            fcslen);
 #undef BITNO_32
 #undef BITNO_16
            fcslen);
 #undef BITNO_32
 #undef BITNO_16


@@ -2899,12 +2916,13 @@ out:
 }
 
 static u_int
 }
 
 static u_int

-ieee802_11_avs_radio_print(const u_char *p, u_int length, u_int caplen)
+ieee802_11_avs_radio_print(netdissect_options *ndo,
+                           const u_char *p, u_int length, u_int caplen)

 {
 {

-       u_int32_t caphdr_len;
+       uint32_t caphdr_len;

 
        if (caplen < 8) {
 
        if (caplen < 8) {

-               printf("%s", tstr);
+               ND_PRINT((ndo, "%s", tstr));

                return caplen;
        }
 
                return caplen;
        }
 


@@ -2915,16 +2933,16 @@ ieee802_11_avs_radio_print(const u_char *p, u_int length, u_int caplen)
                 * to be large enough to include even the version
                 * cookie or capture header length!
                 */
                 * to be large enough to include even the version
                 * cookie or capture header length!
                 */

-               printf("%s", tstr);
+               ND_PRINT((ndo, "%s", tstr));

                return caplen;
        }
 
        if (caplen < caphdr_len) {
                return caplen;
        }
 
        if (caplen < caphdr_len) {

-               printf("%s", tstr);
+               ND_PRINT((ndo, "%s", tstr));

                return caplen;
        }
 
                return caplen;
        }
 

-       return caphdr_len + ieee802_11_print(p + caphdr_len,
+       return caphdr_len + ieee802_11_print(ndo, p + caphdr_len,

            length - caphdr_len, caplen - caphdr_len, 0, 0);
 }
 
            length - caphdr_len, caplen - caphdr_len, 0, 0);
 }
 


@@ -2948,28 +2966,29 @@ ieee802_11_avs_radio_print(const u_char *p, u_int length, u_int caplen)
  * indicate whether it's a Prism header or an AVS header).
  */
 u_int
  * indicate whether it's a Prism header or an AVS header).
  */
 u_int

-prism_if_print(const struct pcap_pkthdr *h, const u_char *p)
+prism_if_print(netdissect_options *ndo,
+               const struct pcap_pkthdr *h, const u_char *p)

 {
        u_int caplen = h->caplen;
        u_int length = h->len;
 {
        u_int caplen = h->caplen;
        u_int length = h->len;

-       u_int32_t msgcode;
+       uint32_t msgcode;

 
        if (caplen < 4) {
 
        if (caplen < 4) {

-               printf("%s", tstr);
+               ND_PRINT((ndo, "%s", tstr));

                return caplen;
        }
 
        msgcode = EXTRACT_32BITS(p);
        if (msgcode == WLANCAP_MAGIC_COOKIE_V1 ||
            msgcode == WLANCAP_MAGIC_COOKIE_V2)
                return caplen;
        }
 
        msgcode = EXTRACT_32BITS(p);
        if (msgcode == WLANCAP_MAGIC_COOKIE_V1 ||
            msgcode == WLANCAP_MAGIC_COOKIE_V2)

-               return ieee802_11_avs_radio_print(p, length, caplen);
+               return ieee802_11_avs_radio_print(ndo, p, length, caplen);

 
        if (caplen < PRISM_HDR_LEN) {
 
        if (caplen < PRISM_HDR_LEN) {

-               printf("%s", tstr);
+               ND_PRINT((ndo, "%s", tstr));

                return caplen;
        }
 
                return caplen;
        }
 

-       return PRISM_HDR_LEN + ieee802_11_print(p + PRISM_HDR_LEN,
+       return PRISM_HDR_LEN + ieee802_11_print(ndo, p + PRISM_HDR_LEN,

            length - PRISM_HDR_LEN, caplen - PRISM_HDR_LEN, 0, 0);
 }
 
            length - PRISM_HDR_LEN, caplen - PRISM_HDR_LEN, 0, 0);
 }
 


@@ -2978,9 +2997,10 @@ prism_if_print(const struct pcap_pkthdr *h, const u_char *p)
  * header, containing information such as radio information.
  */
 u_int
  * header, containing information such as radio information.
  */
 u_int

-ieee802_11_radio_if_print(const struct pcap_pkthdr *h, const u_char *p)
+ieee802_11_radio_if_print(netdissect_options *ndo,
+                          const struct pcap_pkthdr *h, const u_char *p)

 {
 {

-       return ieee802_11_radio_print(p, h->len, h->caplen);
+       return ieee802_11_radio_print(ndo, p, h->len, h->caplen);

 }
 
 /*
 }
 
 /*


@@ -2989,7 +3009,8 @@ ieee802_11_radio_if_print(const struct pcap_pkthdr *h, const u_char *p)
  * which we currently ignore.
  */
 u_int
  * which we currently ignore.
  */
 u_int

-ieee802_11_radio_avs_if_print(const struct pcap_pkthdr *h, const u_char *p)
+ieee802_11_radio_avs_if_print(netdissect_options *ndo,
+                              const struct pcap_pkthdr *h, const u_char *p)

 {
 {

-       return ieee802_11_avs_radio_print(p, h->len, h->caplen);
+       return ieee802_11_avs_radio_print(ndo, p, h->len, h->caplen);

 }
 }