ICMPv6: Add the IPv6-Only flag

[tcpdump] / print-802_11.c

diff --git a/print-802_11.c b/print-802_11.c
index 4db7ab6bcecb3bb45beeeeb65ee0c4adfdba81b2..73b79764cd26219eaaa56f7183dc6f533cc01d11 100644 (file)
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -75,22 +75,22 @@
 #define        T_DATA 0x2 /* data */
 #define        T_RESV 0x3  /* reserved */
 
 #define        T_DATA 0x2 /* data */
 #define        T_RESV 0x3  /* reserved */
 

-#define        ST_ASSOC_REQUEST        0x0
-#define        ST_ASSOC_RESPONSE       0x1
-#define        ST_REASSOC_REQUEST      0x2
-#define        ST_REASSOC_RESPONSE     0x3
-#define        ST_PROBE_REQUEST        0x4
-#define        ST_PROBE_RESPONSE       0x5
-/* RESERVED                    0x6  */
-/* RESERVED                    0x7  */
-#define        ST_BEACON               0x8
+#define        ST_ASSOC_REQUEST        0x0
+#define        ST_ASSOC_RESPONSE       0x1
+#define        ST_REASSOC_REQUEST      0x2
+#define        ST_REASSOC_RESPONSE     0x3
+#define        ST_PROBE_REQUEST        0x4
+#define        ST_PROBE_RESPONSE       0x5
+/* RESERVED                    0x6  */
+/* RESERVED                    0x7  */
+#define        ST_BEACON               0x8

 #define        ST_ATIM                 0x9
 #define        ST_DISASSOC             0xA
 #define        ST_AUTH                 0xB
 #define        ST_DEAUTH               0xC
 #define        ST_ACTION               0xD
 #define        ST_ATIM                 0x9
 #define        ST_DISASSOC             0xA
 #define        ST_AUTH                 0xB
 #define        ST_DEAUTH               0xC
 #define        ST_ACTION               0xD

-/* RESERVED                    0xE  */
-/* RESERVED                    0xF  */
+/* RESERVED                    0xE  */
+/* RESERVED                    0xF  */

 
 static const struct tok st_str[] = {
        { ST_ASSOC_REQUEST,    "Assoc Request"    },
 
 static const struct tok st_str[] = {
        { ST_ASSOC_REQUEST,    "Assoc Request"    },


@@ -175,7 +175,7 @@ static const struct tok ctrl_str[] = {
 
 struct mgmt_header_t {
        nd_uint16_t     fc;
 
 struct mgmt_header_t {
        nd_uint16_t     fc;

-       nd_uint16_t     duration;
+       nd_uint16_t     duration;

        nd_mac_addr     da;
        nd_mac_addr     sa;
        nd_mac_addr     bssid;
        nd_mac_addr     da;
        nd_mac_addr     sa;
        nd_mac_addr     bssid;


@@ -215,7 +215,7 @@ struct fh_t {
        uint8_t         length;
        uint16_t        dwell_time;
        uint8_t         hop_set;
        uint8_t         length;
        uint16_t        dwell_time;
        uint8_t         hop_set;

-       uint8_t         hop_pattern;
+       uint8_t hop_pattern;

        uint8_t         hop_index;
 };
 
        uint8_t         hop_index;
 };
 


@@ -231,7 +231,7 @@ struct cf_t {
        uint8_t         count;
        uint8_t         period;
        uint16_t        max_duration;
        uint8_t         count;
        uint8_t         period;
        uint16_t        max_duration;

-       uint16_t        dur_remaing;
+       uint16_t        dur_remaining;

 };
 
 struct tim_t {
 };
 
 struct tim_t {


@@ -243,38 +243,38 @@ struct tim_t {
        uint8_t         bitmap[251];
 };
 
        uint8_t         bitmap[251];
 };
 

-#define        E_SSID          0
-#define        E_RATES         1
+#define        E_SSID          0
+#define        E_RATES 1

 #define        E_FH            2
 #define        E_FH            2

-#define        E_DS            3
+#define        E_DS            3

 #define        E_CF            4
 #define        E_TIM           5
 #define        E_CF            4
 #define        E_TIM           5

-#define        E_IBSS          6
-/* reserved            7 */
-/* reserved            8 */
-/* reserved            9 */
-/* reserved            10 */
-/* reserved            11 */
-/* reserved            12 */
-/* reserved            13 */
-/* reserved            14 */
-/* reserved            15 */
-/* reserved            16 */
-
-#define        E_CHALLENGE     16
-/* reserved            17 */
-/* reserved            18 */
-/* reserved            19 */
-/* reserved            16 */
-/* reserved            16 */
+#define        E_IBSS          6
+/* reserved            7 */
+/* reserved            8 */
+/* reserved            9 */
+/* reserved            10 */
+/* reserved            11 */
+/* reserved            12 */
+/* reserved            13 */
+/* reserved            14 */
+/* reserved            15 */
+/* reserved            16 */
+
+#define        E_CHALLENGE     16
+/* reserved            17 */
+/* reserved            18 */
+/* reserved            19 */
+/* reserved            16 */
+/* reserved            16 */

 
 
 struct mgmt_body_t {
 
 
 struct mgmt_body_t {

-       uint8_t         timestamp[IEEE802_11_TSTAMP_LEN];
-       uint16_t        beacon_interval;
-       uint16_t        listen_interval;
-       uint16_t        status_code;
-       uint16_t        aid;
+       uint8_t         timestamp[IEEE802_11_TSTAMP_LEN];
+       uint16_t        beacon_interval;
+       uint16_t        listen_interval;
+       uint16_t        status_code;
+       uint16_t        aid;

        u_char          ap[IEEE802_11_AP_LEN];
        uint16_t        reason_code;
        uint16_t        auth_alg;
        u_char          ap[IEEE802_11_AP_LEN];
        uint16_t        reason_code;
        uint16_t        auth_alg;


@@ -285,7 +285,7 @@ struct mgmt_body_t {
        int             ssid_present;
        struct ssid_t   ssid;
        int             rates_present;
        int             ssid_present;
        struct ssid_t   ssid;
        int             rates_present;

-       struct rates_t  rates;
+       struct rates_t  rates;

        int             ds_present;
        struct ds_t     ds;
        int             cf_present;
        int             ds_present;
        struct ds_t     ds;
        int             cf_present;


@@ -913,7 +913,7 @@ static const char *status_text[] = {
 static const char *reason_text[] = {
        "Reserved",                                             /* 0 */
        "Unspecified reason",                                   /* 1 */
 static const char *reason_text[] = {
        "Reserved",                                             /* 0 */
        "Unspecified reason",                                   /* 1 */

-       "Previous authentication no longer valid",              /* 2 */
+       "Previous authentication no longer valid",              /* 2 */

        "Deauthenticated because sending station is leaving (or has left) "
          "IBSS or ESS",                                        /* 3 */
        "Disassociated due to inactivity",                      /* 4 */
        "Deauthenticated because sending station is leaving (or has left) "
          "IBSS or ESS",                                        /* 3 */
        "Disassociated due to inactivity",                      /* 4 */


@@ -956,7 +956,7 @@ static const char *reason_text[] = {
        "Disassociated because QoS AP lacks sufficient bandwidth for this "
          "QoS STA",                                            /* 33 */
        "Disassociated because of excessive number of frames that need to be "
        "Disassociated because QoS AP lacks sufficient bandwidth for this "
          "QoS STA",                                            /* 33 */
        "Disassociated because of excessive number of frames that need to be "

-          "acknowledged, but are not acknowledged for AP transmissions "
+         "acknowledged, but are not acknowledged for AP transmissions "

          "and/or poor channel conditions",                     /* 34 */
        "Disassociated because STA is transmitting outside the limits "
          "of its TXOPs",                                       /* 35 */
          "and/or poor channel conditions",                     /* 34 */
        "Disassociated because STA is transmitting outside the limits "
          "of its TXOPs",                                       /* 35 */


@@ -980,24 +980,25 @@ static const char *reason_text[] = {
 
 static int
 wep_print(netdissect_options *ndo,
 
 static int
 wep_print(netdissect_options *ndo,

-          const u_char *p)
+         const u_char *p)

 {
        uint32_t iv;
 
 {
        uint32_t iv;
 

-       if (!ND_TTEST_LEN(p, IEEE802_11_IV_LEN + IEEE802_11_KID_LEN))
-               return 0;
+       ND_TCHECK_LEN(p, IEEE802_11_IV_LEN + IEEE802_11_KID_LEN);

        iv = EXTRACT_LE_U_4(p);
 
        ND_PRINT(" IV:%3x Pad %x KeyID %x", IV_IV(iv), IV_PAD(iv),
            IV_KEYID(iv));
 
        return 1;
        iv = EXTRACT_LE_U_4(p);
 
        ND_PRINT(" IV:%3x Pad %x KeyID %x", IV_IV(iv), IV_PAD(iv),
            IV_KEYID(iv));
 
        return 1;

+trunc:
+       return 0;

 }
 
 static int
 parse_elements(netdissect_options *ndo,
 }
 
 static int
 parse_elements(netdissect_options *ndo,

-               struct mgmt_body_t *pbody, const u_char *p, int offset,
-               u_int length)
+              struct mgmt_body_t *pbody, const u_char *p, int offset,
+              u_int length)

 {
        u_int elementlen;
        struct ssid_t ssid;
 {
        u_int elementlen;
        struct ssid_t ssid;


@@ -1019,17 +1020,15 @@ parse_elements(netdissect_options *ndo,
 
        while (length != 0) {
                /* Make sure we at least have the element ID and length. */
 
        while (length != 0) {
                /* Make sure we at least have the element ID and length. */

-               if (!ND_TTEST_2(p + offset))
-                       return 0;
+               ND_TCHECK_2(p + offset);

                if (length < 2)
                if (length < 2)

-                       return 0;
+                       goto trunc;

                elementlen = EXTRACT_U_1(p + offset + 1);
 
                /* Make sure we have the entire element. */
                elementlen = EXTRACT_U_1(p + offset + 1);
 
                /* Make sure we have the entire element. */

-               if (!ND_TTEST_LEN(p + offset + 2, elementlen))
-                       return 0;
+               ND_TCHECK_LEN(p + offset + 2, elementlen);

                if (length < elementlen + 2)
                if (length < elementlen + 2)

-                       return 0;
+                       goto trunc;

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


@@ -1205,6 +1204,8 @@ parse_elements(netdissect_options *ndo,
 
        /* No problems found. */
        return 1;
 
        /* No problems found. */
        return 1;

+trunc:
+       return 0;

 }
 
 /*********************************************************************************
 }
 
 /*********************************************************************************


@@ -1213,7 +1214,7 @@ parse_elements(netdissect_options *ndo,
 
 static int
 handle_beacon(netdissect_options *ndo,
 
 static int
 handle_beacon(netdissect_options *ndo,

-              const u_char *p, u_int length)
+             const u_char *p, u_int length)

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


@@ -1221,11 +1222,11 @@ handle_beacon(netdissect_options *ndo,
 
        memset(&pbody, 0, sizeof(pbody));
 
 
        memset(&pbody, 0, sizeof(pbody));
 

-       if (!ND_TTEST_LEN(p, IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN + IEEE802_11_CAPINFO_LEN))
-               return 0;
+       ND_TCHECK_LEN(p, IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN +
+                     IEEE802_11_CAPINFO_LEN);

        if (length < IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN +
            IEEE802_11_CAPINFO_LEN)
        if (length < IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN +
            IEEE802_11_CAPINFO_LEN)

-               return 0;
+               goto trunc;

        memcpy(&pbody.timestamp, p, IEEE802_11_TSTAMP_LEN);
        offset += IEEE802_11_TSTAMP_LEN;
        length -= IEEE802_11_TSTAMP_LEN;
        memcpy(&pbody.timestamp, p, IEEE802_11_TSTAMP_LEN);
        offset += IEEE802_11_TSTAMP_LEN;
        length -= IEEE802_11_TSTAMP_LEN;


@@ -1245,11 +1246,13 @@ handle_beacon(netdissect_options *ndo,
        PRINT_DS_CHANNEL(pbody);
 
        return ret;
        PRINT_DS_CHANNEL(pbody);
 
        return ret;

+trunc:
+       return 0;

 }
 
 static int
 handle_assoc_request(netdissect_options *ndo,
 }
 
 static int
 handle_assoc_request(netdissect_options *ndo,

-                     const u_char *p, u_int length)
+                    const u_char *p, u_int length)

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


@@ -1257,10 +1260,9 @@ handle_assoc_request(netdissect_options *ndo,
 
        memset(&pbody, 0, sizeof(pbody));
 
 
        memset(&pbody, 0, sizeof(pbody));
 

-       if (!ND_TTEST_LEN(p, IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN))
-               return 0;
+       ND_TCHECK_LEN(p, IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN);

        if (length < IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN)
        if (length < IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN)

-               return 0;
+               goto trunc;

        pbody.capability_info = EXTRACT_LE_U_2(p);
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;
        pbody.capability_info = EXTRACT_LE_U_2(p);
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;


@@ -1273,11 +1275,13 @@ handle_assoc_request(netdissect_options *ndo,
        PRINT_SSID(pbody);
        PRINT_RATES(pbody);
        return ret;
        PRINT_SSID(pbody);
        PRINT_RATES(pbody);
        return ret;

+trunc:
+       return 0;

 }
 
 static int
 handle_assoc_response(netdissect_options *ndo,
 }
 
 static int
 handle_assoc_response(netdissect_options *ndo,

-                      const u_char *p, u_int length)
+                     const u_char *p, u_int length)

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


@@ -1285,11 +1289,11 @@ handle_assoc_response(netdissect_options *ndo,
 
        memset(&pbody, 0, sizeof(pbody));
 
 
        memset(&pbody, 0, sizeof(pbody));
 

-       if (!ND_TTEST_LEN(p, IEEE802_11_CAPINFO_LEN + IEEE802_11_STATUS_LEN + IEEE802_11_AID_LEN))
-               return 0;
+       ND_TCHECK_LEN(p, IEEE802_11_CAPINFO_LEN + IEEE802_11_STATUS_LEN +
+                     IEEE802_11_AID_LEN);

        if (length < IEEE802_11_CAPINFO_LEN + IEEE802_11_STATUS_LEN +
            IEEE802_11_AID_LEN)
        if (length < IEEE802_11_CAPINFO_LEN + IEEE802_11_STATUS_LEN +
            IEEE802_11_AID_LEN)

-               return 0;
+               goto trunc;

        pbody.capability_info = EXTRACT_LE_U_2(p);
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;
        pbody.capability_info = EXTRACT_LE_U_2(p);
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;


@@ -1309,11 +1313,13 @@ handle_assoc_response(netdissect_options *ndo,
                : "n/a"));
 
        return ret;
                : "n/a"));
 
        return ret;

+trunc:
+       return 0;

 }
 
 static int
 handle_reassoc_request(netdissect_options *ndo,
 }
 
 static int
 handle_reassoc_request(netdissect_options *ndo,

-                       const u_char *p, u_int length)
+                      const u_char *p, u_int length)

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


@@ -1321,11 +1327,11 @@ handle_reassoc_request(netdissect_options *ndo,
 
        memset(&pbody, 0, sizeof(pbody));
 
 
        memset(&pbody, 0, sizeof(pbody));
 

-       if (!ND_TTEST_LEN(p, IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN + IEEE802_11_AP_LEN))
-               return 0;
+       ND_TCHECK_LEN(p, IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN +
+                     IEEE802_11_AP_LEN);

        if (length < IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN +
            IEEE802_11_AP_LEN)
        if (length < IEEE802_11_CAPINFO_LEN + IEEE802_11_LISTENINT_LEN +
            IEEE802_11_AP_LEN)

-               return 0;
+               goto trunc;

        pbody.capability_info = EXTRACT_LE_U_2(p);
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;
        pbody.capability_info = EXTRACT_LE_U_2(p);
        offset += IEEE802_11_CAPINFO_LEN;
        length -= IEEE802_11_CAPINFO_LEN;


@@ -1342,19 +1348,21 @@ handle_reassoc_request(netdissect_options *ndo,
        ND_PRINT(" AP : %s", etheraddr_string(ndo,  pbody.ap ));
 
        return ret;
        ND_PRINT(" AP : %s", etheraddr_string(ndo,  pbody.ap ));
 
        return ret;

+trunc:
+       return 0;

 }
 
 static int
 handle_reassoc_response(netdissect_options *ndo,
 }
 
 static int
 handle_reassoc_response(netdissect_options *ndo,

-                        const u_char *p, u_int length)
+                       const u_char *p, u_int length)

 {
 {

-       /* Same as a Association Reponse */
+       /* Same as a Association Response */

        return handle_assoc_response(ndo, p, length);
 }
 
 static int
 handle_probe_request(netdissect_options *ndo,
        return handle_assoc_response(ndo, p, length);
 }
 
 static int
 handle_probe_request(netdissect_options *ndo,

-                     const u_char *p, u_int length)
+                    const u_char *p, u_int length)

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


@@ -1372,7 +1380,7 @@ handle_probe_request(netdissect_options *ndo,
 
 static int
 handle_probe_response(netdissect_options *ndo,
 
 static int
 handle_probe_response(netdissect_options *ndo,

-                      const u_char *p, u_int length)
+                     const u_char *p, u_int length)

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


@@ -1380,11 +1388,11 @@ handle_probe_response(netdissect_options *ndo,
 
        memset(&pbody, 0, sizeof(pbody));
 
 
        memset(&pbody, 0, sizeof(pbody));
 

-       if (!ND_TTEST_LEN(p, IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN + IEEE802_11_CAPINFO_LEN))
-               return 0;
+       ND_TCHECK_LEN(p, IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN +
+                     IEEE802_11_CAPINFO_LEN);

        if (length < IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN +
            IEEE802_11_CAPINFO_LEN)
        if (length < IEEE802_11_TSTAMP_LEN + IEEE802_11_BCNINT_LEN +
            IEEE802_11_CAPINFO_LEN)

-               return 0;
+               goto trunc;

        memcpy(&pbody.timestamp, p, IEEE802_11_TSTAMP_LEN);
        offset += IEEE802_11_TSTAMP_LEN;
        length -= IEEE802_11_TSTAMP_LEN;
        memcpy(&pbody.timestamp, p, IEEE802_11_TSTAMP_LEN);
        offset += IEEE802_11_TSTAMP_LEN;
        length -= IEEE802_11_TSTAMP_LEN;


@@ -1402,6 +1410,8 @@ handle_probe_response(netdissect_options *ndo,
        PRINT_DS_CHANNEL(pbody);
 
        return ret;
        PRINT_DS_CHANNEL(pbody);
 
        return ret;

+trunc:
+       return 0;

 }
 
 static int
 }
 
 static int


@@ -1413,16 +1423,15 @@ handle_atim(void)
 
 static int
 handle_disassoc(netdissect_options *ndo,
 
 static int
 handle_disassoc(netdissect_options *ndo,

-                const u_char *p, u_int length)
+               const u_char *p, u_int length)

 {
        struct mgmt_body_t  pbody;
 
        memset(&pbody, 0, sizeof(pbody));
 
 {
        struct mgmt_body_t  pbody;
 
        memset(&pbody, 0, sizeof(pbody));
 

-       if (!ND_TTEST_LEN(p, IEEE802_11_REASON_LEN))
-               return 0;
+       ND_TCHECK_LEN(p, IEEE802_11_REASON_LEN);

        if (length < IEEE802_11_REASON_LEN)
        if (length < IEEE802_11_REASON_LEN)

-               return 0;
+               goto trunc;

        pbody.reason_code = EXTRACT_LE_U_2(p);
 
        ND_PRINT(": %s",
        pbody.reason_code = EXTRACT_LE_U_2(p);
 
        ND_PRINT(": %s",


@@ -1431,11 +1440,13 @@ handle_disassoc(netdissect_options *ndo,
                : "Reserved");
 
        return 1;
                : "Reserved");
 
        return 1;

+trunc:
+       return 0;

 }
 
 static int
 handle_auth(netdissect_options *ndo,
 }
 
 static int
 handle_auth(netdissect_options *ndo,

-            const u_char *p, u_int length)
+           const u_char *p, u_int length)

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


@@ -1443,10 +1454,9 @@ handle_auth(netdissect_options *ndo,
 
        memset(&pbody, 0, sizeof(pbody));
 
 
        memset(&pbody, 0, sizeof(pbody));
 

-       if (!ND_TTEST_6(p))
-               return 0;
+       ND_TCHECK_6(p);

        if (length < 6)
        if (length < 6)

-               return 0;
+               goto trunc;

        pbody.auth_alg = EXTRACT_LE_U_2(p);
        offset += 2;
        length -= 2;
        pbody.auth_alg = EXTRACT_LE_U_2(p);
        offset += 2;
        length -= 2;


@@ -1468,7 +1478,7 @@ handle_auth(netdissect_options *ndo,
                        : "Reserved",
                    pbody.auth_trans_seq_num,
                    ((pbody.auth_trans_seq_num % 2)
                        : "Reserved",
                    pbody.auth_trans_seq_num,
                    ((pbody.auth_trans_seq_num % 2)

-                       ? ((pbody.status_code < NUM_STATUSES)
+                       ? ((pbody.status_code < NUM_STATUSES)

                               ? status_text[pbody.status_code]
                               : "n/a") : ""));
                return ret;
                               ? status_text[pbody.status_code]
                               : "n/a") : ""));
                return ret;


@@ -1479,27 +1489,28 @@ handle_auth(netdissect_options *ndo,
                : "Reserved",
            pbody.auth_trans_seq_num,
            (pbody.auth_trans_seq_num % 2)
                : "Reserved",
            pbody.auth_trans_seq_num,
            (pbody.auth_trans_seq_num % 2)

-               ? ((pbody.status_code < NUM_STATUSES)
+               ? ((pbody.status_code < NUM_STATUSES)

                    ? status_text[pbody.status_code]
                    ? status_text[pbody.status_code]

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

 
        return ret;
 
        return ret;

+trunc:
+       return 0;

 }
 
 static int
 handle_deauth(netdissect_options *ndo,
 }
 
 static int
 handle_deauth(netdissect_options *ndo,

-              const uint8_t *src, const u_char *p, u_int length)
+             const uint8_t *src, const u_char *p, u_int length)

 {
        struct mgmt_body_t  pbody;
        const char *reason = NULL;
 
        memset(&pbody, 0, sizeof(pbody));
 
 {
        struct mgmt_body_t  pbody;
        const char *reason = NULL;
 
        memset(&pbody, 0, sizeof(pbody));
 

-       if (!ND_TTEST_LEN(p, IEEE802_11_REASON_LEN))
-               return 0;
+       ND_TCHECK_LEN(p, IEEE802_11_REASON_LEN);

        if (length < IEEE802_11_REASON_LEN)
        if (length < IEEE802_11_REASON_LEN)

-               return 0;
+               goto trunc;

        pbody.reason_code = EXTRACT_LE_U_2(p);
 
        reason = (pbody.reason_code < NUM_REASONS)
        pbody.reason_code = EXTRACT_LE_U_2(p);
 
        reason = (pbody.reason_code < NUM_REASONS)


@@ -1512,6 +1523,8 @@ handle_deauth(netdissect_options *ndo,
                ND_PRINT(" (%s): %s", etheraddr_string(ndo, src), reason);
        }
        return 1;
                ND_PRINT(" (%s): %s", etheraddr_string(ndo, src), reason);
        }
        return 1;

+trunc:
+       return 0;

 }
 
 #define        PRINT_HT_ACTION(v) (\
 }
 
 #define        PRINT_HT_ACTION(v) (\


@@ -1566,12 +1579,11 @@ handle_deauth(netdissect_options *ndo,
 
 static int
 handle_action(netdissect_options *ndo,
 
 static int
 handle_action(netdissect_options *ndo,

-              const uint8_t *src, const u_char *p, u_int length)
+             const uint8_t *src, const u_char *p, u_int length)

 {
 {

-       if (!ND_TTEST_2(p))
-               return 0;
+       ND_TCHECK_2(p);

        if (length < 2)
        if (length < 2)

-               return 0;
+               goto trunc;

        if (ndo->ndo_eflag) {
                ND_PRINT(": ");
        } else {
        if (ndo->ndo_eflag) {
                ND_PRINT(": ");
        } else {


@@ -1596,6 +1608,8 @@ handle_action(netdissect_options *ndo,
                break;
        }
        return 1;
                break;
        }
        return 1;

+trunc:
+       return 0;

 }
 
 
 }
 
 


@@ -1606,7 +1620,7 @@ handle_action(netdissect_options *ndo,
 
 static int
 mgmt_body_print(netdissect_options *ndo,
 
 static int
 mgmt_body_print(netdissect_options *ndo,

-                uint16_t fc, const uint8_t *src, const u_char *p, u_int length)
+               uint16_t fc, const uint8_t *src, const u_char *p, u_int length)

 {
        ND_PRINT("%s", tok2str(st_str, "Unhandled Management subtype(%x)", FC_SUBTYPE(fc)));
 
 {
        ND_PRINT("%s", tok2str(st_str, "Unhandled Management subtype(%x)", FC_SUBTYPE(fc)));
 


@@ -1650,7 +1664,7 @@ mgmt_body_print(netdissect_options *ndo,
 
 static int
 ctrl_body_print(netdissect_options *ndo,
 
 static int
 ctrl_body_print(netdissect_options *ndo,

-                uint16_t fc, const u_char *p)
+               uint16_t fc, const u_char *p)

 {
        ND_PRINT("%s", tok2str(ctrl_str, "Unknown Ctrl Subtype", FC_SUBTYPE(fc)));
        switch (FC_SUBTYPE(fc)) {
 {
        ND_PRINT("%s", tok2str(ctrl_str, "Unknown Ctrl Subtype", FC_SUBTYPE(fc)));
        switch (FC_SUBTYPE(fc)) {


@@ -1658,8 +1672,7 @@ ctrl_body_print(netdissect_options *ndo,
                /* XXX - requires special handling */
                break;
        case CTRL_BAR:
                /* XXX - requires special handling */
                break;
        case CTRL_BAR:

-               if (!ND_TTEST_LEN(p, CTRL_BAR_HDRLEN))
-                       return 0;
+               ND_TCHECK_LEN(p, CTRL_BAR_HDRLEN);

                if (!ndo->ndo_eflag)
                        ND_PRINT(" RA:%s TA:%s CTL(%x) SEQ(%u) ",
                            etheraddr_string(ndo, ((const struct ctrl_bar_hdr_t *)p)->ra),
                if (!ndo->ndo_eflag)
                        ND_PRINT(" RA:%s TA:%s CTL(%x) SEQ(%u) ",
                            etheraddr_string(ndo, ((const struct ctrl_bar_hdr_t *)p)->ra),


@@ -1668,55 +1681,50 @@ ctrl_body_print(netdissect_options *ndo,
                            EXTRACT_LE_U_2(((const struct ctrl_bar_hdr_t *)p)->seq));
                break;
        case CTRL_BA:
                            EXTRACT_LE_U_2(((const struct ctrl_bar_hdr_t *)p)->seq));
                break;
        case CTRL_BA:

-               if (!ND_TTEST_LEN(p, CTRL_BA_HDRLEN))
-                       return 0;
+               ND_TCHECK_LEN(p, CTRL_BA_HDRLEN);

                if (!ndo->ndo_eflag)
                        ND_PRINT(" RA:%s ",
                            etheraddr_string(ndo, ((const struct ctrl_ba_hdr_t *)p)->ra));
                break;
        case CTRL_PS_POLL:
                if (!ndo->ndo_eflag)
                        ND_PRINT(" RA:%s ",
                            etheraddr_string(ndo, ((const struct ctrl_ba_hdr_t *)p)->ra));
                break;
        case CTRL_PS_POLL:

-               if (!ND_TTEST_LEN(p, CTRL_PS_POLL_HDRLEN))
-                       return 0;
+               ND_TCHECK_LEN(p, CTRL_PS_POLL_HDRLEN);

                ND_PRINT(" AID(%x)",
                    EXTRACT_LE_U_2(((const struct ctrl_ps_poll_hdr_t *)p)->aid));
                break;
        case CTRL_RTS:
                ND_PRINT(" AID(%x)",
                    EXTRACT_LE_U_2(((const struct ctrl_ps_poll_hdr_t *)p)->aid));
                break;
        case CTRL_RTS:

-               if (!ND_TTEST_LEN(p, CTRL_RTS_HDRLEN))
-                       return 0;
+               ND_TCHECK_LEN(p, CTRL_RTS_HDRLEN);

                if (!ndo->ndo_eflag)
                        ND_PRINT(" TA:%s ",
                            etheraddr_string(ndo, ((const struct ctrl_rts_hdr_t *)p)->ta));
                break;
        case CTRL_CTS:
                if (!ndo->ndo_eflag)
                        ND_PRINT(" TA:%s ",
                            etheraddr_string(ndo, ((const struct ctrl_rts_hdr_t *)p)->ta));
                break;
        case CTRL_CTS:

-               if (!ND_TTEST_LEN(p, CTRL_CTS_HDRLEN))
-                       return 0;
+               ND_TCHECK_LEN(p, CTRL_CTS_HDRLEN);

                if (!ndo->ndo_eflag)
                        ND_PRINT(" RA:%s ",
                            etheraddr_string(ndo, ((const struct ctrl_cts_hdr_t *)p)->ra));
                break;
        case CTRL_ACK:
                if (!ndo->ndo_eflag)
                        ND_PRINT(" RA:%s ",
                            etheraddr_string(ndo, ((const struct ctrl_cts_hdr_t *)p)->ra));
                break;
        case CTRL_ACK:

-               if (!ND_TTEST_LEN(p, CTRL_ACK_HDRLEN))
-                       return 0;
+               ND_TCHECK_LEN(p, CTRL_ACK_HDRLEN);

                if (!ndo->ndo_eflag)
                        ND_PRINT(" RA:%s ",
                            etheraddr_string(ndo, ((const struct ctrl_ack_hdr_t *)p)->ra));
                break;
        case CTRL_CF_END:
                if (!ndo->ndo_eflag)
                        ND_PRINT(" RA:%s ",
                            etheraddr_string(ndo, ((const struct ctrl_ack_hdr_t *)p)->ra));
                break;
        case CTRL_CF_END:

-               if (!ND_TTEST_LEN(p, CTRL_END_HDRLEN))
-                       return 0;
+               ND_TCHECK_LEN(p, CTRL_END_HDRLEN);

                if (!ndo->ndo_eflag)
                        ND_PRINT(" RA:%s ",
                            etheraddr_string(ndo, ((const struct ctrl_end_hdr_t *)p)->ra));
                break;
        case CTRL_END_ACK:
                if (!ndo->ndo_eflag)
                        ND_PRINT(" RA:%s ",
                            etheraddr_string(ndo, ((const struct ctrl_end_hdr_t *)p)->ra));
                break;
        case CTRL_END_ACK:

-               if (!ND_TTEST_LEN(p, CTRL_END_ACK_HDRLEN))
-                       return 0;
+               ND_TCHECK_LEN(p, CTRL_END_ACK_HDRLEN);

                if (!ndo->ndo_eflag)
                        ND_PRINT(" RA:%s ",
                            etheraddr_string(ndo, ((const struct ctrl_end_ack_hdr_t *)p)->ra));
                break;
        }
        return 1;
                if (!ndo->ndo_eflag)
                        ND_PRINT(" RA:%s ",
                            etheraddr_string(ndo, ((const struct ctrl_end_ack_hdr_t *)p)->ra));
                break;
        }
        return 1;

+trunc:
+       return 0;

 }
 
 /*
 }
 
 /*


@@ -1734,7 +1742,7 @@ ctrl_body_print(netdissect_options *ndo,
  */
 static void
 get_data_src_dst_mac(uint16_t fc, const u_char *p, const uint8_t **srcp,
  */
 static void
 get_data_src_dst_mac(uint16_t fc, const u_char *p, const uint8_t **srcp,

-                     const uint8_t **dstp)
+                    const uint8_t **dstp)

 {
 #define ADDR1  (p + 4)
 #define ADDR2  (p + 10)
 {
 #define ADDR1  (p + 4)
 #define ADDR2  (p + 10)


@@ -1896,7 +1904,7 @@ ctrl_header_print(netdissect_options *ndo, uint16_t fc, const u_char *p)
 
 static int
 extract_header_length(netdissect_options *ndo,
 
 static int
 extract_header_length(netdissect_options *ndo,

-                      uint16_t fc)
+                     uint16_t fc)

 {
        int len;
 
 {
        int len;
 


@@ -1949,8 +1957,8 @@ extract_mesh_header_length(const u_char *p)
  */
 static void
 ieee_802_11_hdr_print(netdissect_options *ndo,
  */
 static void
 ieee_802_11_hdr_print(netdissect_options *ndo,

-                      uint16_t fc, const u_char *p, u_int hdrlen,
-                      u_int meshdrlen)
+                     uint16_t fc, const u_char *p, u_int hdrlen,
+                     u_int meshdrlen)

 {
        if (ndo->ndo_vflag) {
                if (FC_MORE_DATA(fc))
 {
        if (ndo->ndo_vflag) {
                if (FC_MORE_DATA(fc))


@@ -2002,8 +2010,8 @@ ieee_802_11_hdr_print(netdissect_options *ndo,
 
 static u_int
 ieee802_11_print(netdissect_options *ndo,
 
 static u_int
 ieee802_11_print(netdissect_options *ndo,

-                 const u_char *p, u_int length, u_int orig_caplen, int pad,
-                 u_int fcslen)
+                const u_char *p, u_int length, u_int orig_caplen, int pad,
+                u_int fcslen)

 {
        uint16_t fc;
        u_int caplen, hdrlen, meshdrlen;
 {
        uint16_t fc;
        u_int caplen, hdrlen, meshdrlen;


@@ -2121,7 +2129,7 @@ ieee802_11_print(netdissect_options *ndo,
  */
 u_int
 ieee802_11_if_print(netdissect_options *ndo,
  */
 u_int
 ieee802_11_if_print(netdissect_options *ndo,

-                    const struct pcap_pkthdr *h, const u_char *p)
+                   const struct pcap_pkthdr *h, const u_char *p)

 {
        ndo->ndo_protocol = "802.11_if";
        return ieee802_11_print(ndo, p, h->len, h->caplen, 0, 0);
 {
        ndo->ndo_protocol = "802.11_if";
        return ieee802_11_print(ndo, p, h->len, h->caplen, 0, 0);


@@ -2227,14 +2235,14 @@ struct ieee80211_radiotap_header {
  *      Tx/Rx data rate.  If bit 0x80 is set then it represents an
  *     an MCS index and not an IEEE rate.
  *
  *      Tx/Rx data rate.  If bit 0x80 is set then it represents an
  *     an MCS index and not an IEEE rate.
  *

- * IEEE80211_RADIOTAP_DBM_ANTSIGNAL     int8_t          decibels from
- *                                                      one milliwatt (dBm)
+ * IEEE80211_RADIOTAP_DBM_ANTSIGNAL     int8_t         decibels from
+ *                                                     one milliwatt (dBm)

  *
  *      RF signal power at the antenna, decibel difference from
  *      one milliwatt.
  *
  *
  *      RF signal power at the antenna, decibel difference from
  *      one milliwatt.
  *

- * IEEE80211_RADIOTAP_DBM_ANTNOISE      int8_t          decibels from
- *                                                      one milliwatt (dBm)
+ * IEEE80211_RADIOTAP_DBM_ANTNOISE      int8_t         decibels from
+ *                                                     one milliwatt (dBm)

  *
  *      RF noise power at the antenna, decibel difference from one
  *      milliwatt.
  *
  *      RF noise power at the antenna, decibel difference from one
  *      milliwatt.


@@ -2268,8 +2276,8 @@ struct ieee80211_radiotap_header {
  *      set at factory calibration.  0 is max power.  Monotonically
  *      nondecreasing with lower power levels.
  *
  *      set at factory calibration.  0 is max power.  Monotonically
  *      nondecreasing with lower power levels.
  *

- * IEEE80211_RADIOTAP_DBM_TX_POWER      int8_t          decibels from
- *                                                      one milliwatt (dBm)
+ * IEEE80211_RADIOTAP_DBM_TX_POWER      int8_t         decibels from
+ *                                                     one milliwatt (dBm)

  *
  *      Transmit power expressed as dBm (decibels from a 1 milliwatt
  *      reference). This is the absolute power level measured at
  *
  *      Transmit power expressed as dBm (decibels from a 1 milliwatt
  *      reference). This is the absolute power level measured at


@@ -2289,10 +2297,10 @@ struct ieee80211_radiotap_header {
  *
  *     Properties of received frames. See flags defined below.
  *
  *
  *     Properties of received frames. See flags defined below.
  *

- * IEEE80211_RADIOTAP_XCHANNEL          uint32_t       bitmap
- *                                     uint16_t        MHz
- *                                     uint8_t         channel number
- *                                     uint8_t         .5 dBm
+ * IEEE80211_RADIOTAP_XCHANNEL          uint32_t       bitmap
+ *                                     uint16_t       MHz
+ *                                     uint8_t        channel number
+ *                                     uint8_t        .5 dBm

  *
  *     Extended channel specification: flags (see below) followed by
  *     frequency in MHz, the corresponding IEEE channel number, and
  *
  *     Extended channel specification: flags (see below) followed by
  *     frequency in MHz, the corresponding IEEE channel number, and


@@ -2300,9 +2308,9 @@ struct ieee80211_radiotap_header {
  *     units.  This property supersedes IEEE80211_RADIOTAP_CHANNEL
  *     and only one of the two should be present.
  *
  *     units.  This property supersedes IEEE80211_RADIOTAP_CHANNEL
  *     and only one of the two should be present.
  *

- * IEEE80211_RADIOTAP_MCS              uint8_t         known
- *                                     uint8_t         flags
- *                                     uint8_t         mcs
+ * IEEE80211_RADIOTAP_MCS              uint8_t        known
+ *                                     uint8_t        flags
+ *                                     uint8_t        mcs

  *
  *     Bitset indicating which fields have known values, followed
  *     by bitset of flag values, followed by the MCS rate index as
  *
  *     Bitset indicating which fields have known values, followed
  *     by bitset of flag values, followed by the MCS rate index as


@@ -2319,8 +2327,8 @@ struct ieee80211_radiotap_header {
  *
  * IEEE80211_RADIOTAP_VENDOR_NAMESPACE
  *                                     uint8_t  OUI[3]
  *
  * IEEE80211_RADIOTAP_VENDOR_NAMESPACE
  *                                     uint8_t  OUI[3]

- *                                   uint8_t  subspace
- *                                   uint16_t length
+ *                                      uint8_t        subspace
+ *                                      uint16_t       length

  *
  *     The Vendor Namespace Field contains three sub-fields. The first
  *     sub-field is 3 bytes long. It contains the vendor's IEEE 802
  *
  *     The Vendor Namespace Field contains three sub-fields. The first
  *     sub-field is 3 bytes long. It contains the vendor's IEEE 802


@@ -2373,15 +2381,15 @@ enum ieee80211_radiotap_type {
 
 /* Useful combinations of channel characteristics, borrowed from Ethereal */
 #define IEEE80211_CHAN_A \
 
 /* Useful combinations of channel characteristics, borrowed from Ethereal */
 #define IEEE80211_CHAN_A \

-        (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM)
+       (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM)

 #define IEEE80211_CHAN_B \
 #define IEEE80211_CHAN_B \

-        (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_CCK)
+       (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_CCK)

 #define IEEE80211_CHAN_G \
 #define IEEE80211_CHAN_G \

-        (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN)
+       (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN)

 #define IEEE80211_CHAN_TA \
 #define IEEE80211_CHAN_TA \

-        (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO)
+       (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO)

 #define IEEE80211_CHAN_TG \
 #define IEEE80211_CHAN_TG \

-        (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN  | IEEE80211_CHAN_TURBO)
+       (IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN  | IEEE80211_CHAN_TURBO)

 
 
 /* For IEEE80211_RADIOTAP_FLAGS */
 
 
 /* For IEEE80211_RADIOTAP_FLAGS */


@@ -2496,7 +2504,7 @@ enum ieee80211_radiotap_type {
 
 static void
 print_chaninfo(netdissect_options *ndo,
 
 static void
 print_chaninfo(netdissect_options *ndo,

-               uint16_t freq, int flags, int presentflags)
+              uint16_t freq, int flags, int presentflags)

 {
        ND_PRINT("%u MHz", freq);
        if (presentflags & (1 << IEEE80211_RADIOTAP_MCS)) {
 {
        ND_PRINT("%u MHz", freq);
        if (presentflags & (1 << IEEE80211_RADIOTAP_MCS)) {


@@ -2542,8 +2550,8 @@ print_chaninfo(netdissect_options *ndo,
 
 static int
 print_radiotap_field(netdissect_options *ndo,
 
 static int
 print_radiotap_field(netdissect_options *ndo,

-                     struct cpack_state *s, uint32_t bit, uint8_t *flagsp,
-                     uint32_t presentflags)
+                    struct cpack_state *s, uint32_t bit, uint8_t *flagsp,
+                    uint32_t presentflags)

 {
        u_int i;
        int rc;
 {
        u_int i;
        int rc;


@@ -3012,8 +3020,8 @@ trunc:
 
 static int
 print_in_radiotap_namespace(netdissect_options *ndo,
 
 static int
 print_in_radiotap_namespace(netdissect_options *ndo,

-                            struct cpack_state *s, uint8_t *flags,
-                            uint32_t presentflags, int bit0)
+                           struct cpack_state *s, uint8_t *flags,
+                           uint32_t presentflags, int bit0)

 {
 #define        BITNO_32(x) (((x) >> 16) ? 16 + BITNO_16((x) >> 16) : BITNO_16((x)))
 #define        BITNO_16(x) (((x) >> 8) ? 8 + BITNO_8((x) >> 8) : BITNO_8((x)))
 {
 #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)))


@@ -3060,7 +3068,7 @@ print_in_radiotap_namespace(netdissect_options *ndo,
 
 u_int
 ieee802_11_radio_print(netdissect_options *ndo,
 
 u_int
 ieee802_11_radio_print(netdissect_options *ndo,

-                       const u_char *p, u_int length, u_int caplen)
+                      const u_char *p, u_int length, u_int caplen)

 {
 #define        BIT(n)  (1U << n)
 #define        IS_EXTENDED(__p)        \
 {
 #define        BIT(n)  (1U << n)
 #define        IS_EXTENDED(__p)        \


@@ -3263,7 +3271,7 @@ ieee802_11_radio_print(netdissect_options *ndo,
 
 static u_int
 ieee802_11_radio_avs_print(netdissect_options *ndo,
 
 static u_int
 ieee802_11_radio_avs_print(netdissect_options *ndo,

-                           const u_char *p, u_int length, u_int caplen)
+                          const u_char *p, u_int length, u_int caplen)

 {
        uint32_t caphdr_len;
 
 {
        uint32_t caphdr_len;
 


@@ -3314,7 +3322,7 @@ ieee802_11_radio_avs_print(netdissect_options *ndo,
  */
 u_int
 prism_if_print(netdissect_options *ndo,
  */
 u_int
 prism_if_print(netdissect_options *ndo,

-               const struct pcap_pkthdr *h, const u_char *p)
+              const struct pcap_pkthdr *h, const u_char *p)

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


@@ -3346,7 +3354,7 @@ prism_if_print(netdissect_options *ndo,
  */
 u_int
 ieee802_11_radio_if_print(netdissect_options *ndo,
  */
 u_int
 ieee802_11_radio_if_print(netdissect_options *ndo,

-                          const struct pcap_pkthdr *h, const u_char *p)
+                         const struct pcap_pkthdr *h, const u_char *p)

 {
        ndo->ndo_protocol = "802.11_radio_if";
        return ieee802_11_radio_print(ndo, p, h->len, h->caplen);
 {
        ndo->ndo_protocol = "802.11_radio_if";
        return ieee802_11_radio_print(ndo, p, h->len, h->caplen);


@@ -3359,7 +3367,7 @@ ieee802_11_radio_if_print(netdissect_options *ndo,
  */
 u_int
 ieee802_11_radio_avs_if_print(netdissect_options *ndo,
  */
 u_int
 ieee802_11_radio_avs_if_print(netdissect_options *ndo,

-                              const struct pcap_pkthdr *h, const u_char *p)
+                             const struct pcap_pkthdr *h, const u_char *p)

 {
        ndo->ndo_protocol = "802.11_radio_avs_if";
        return ieee802_11_radio_avs_print(ndo, p, h->len, h->caplen);
 {
        ndo->ndo_protocol = "802.11_radio_avs_if";
        return ieee802_11_radio_avs_print(ndo, p, h->len, h->caplen);