Address Michael's comments.

[tcpdump] / ieee802_11.h

diff --git a/ieee802_11.h b/ieee802_11.h
index c8d0f9e3bd1bb2593dbd5e2ee41f6cf8e03ea0f3..2aa1345038a25c341fbe56800e01be7712563742 100644 (file)
--- a/ieee802_11.h
+++ b/ieee802_11.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/ieee802_11.h,v 1.11 2005-11-13 12:07:25 guy Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/ieee802_11.h,v 1.12 2007-07-22 19:59:06 guy Exp $ (LBL) */

 /*
  * Copyright (c) 2001
  *     Fortress Technologies
 /*
  * Copyright (c) 2001
  *     Fortress Technologies


@@ -30,6 +30,7 @@
 #define        IEEE802_11_RA_LEN               6
 #define        IEEE802_11_TA_LEN               6
 #define        IEEE802_11_SEQ_LEN              2
 #define        IEEE802_11_RA_LEN               6
 #define        IEEE802_11_TA_LEN               6
 #define        IEEE802_11_SEQ_LEN              2

+#define        IEEE802_11_CTL_LEN              2

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


@@ -67,11 +68,14 @@
 #define        ST_DISASSOC             0xA
 #define        ST_AUTH                 0xB
 #define        ST_DEAUTH               0xC
 #define        ST_DISASSOC             0xA
 #define        ST_AUTH                 0xB
 #define        ST_DEAUTH               0xC

-/* RESERVED                    0xD  */
+#define        ST_ACTION               0xD

 /* RESERVED                    0xE  */
 /* RESERVED                    0xF  */
 
 
 /* RESERVED                    0xE  */
 /* RESERVED                    0xF  */
 
 

+#define CTRL_CONTROL_WRAPPER   0x7
+#define        CTRL_BAR        0x8
+#define        CTRL_BA         0x9

 #define        CTRL_PS_POLL    0xA
 #define        CTRL_RTS        0xB
 #define        CTRL_CTS        0xC
 #define        CTRL_PS_POLL    0xA
 #define        CTRL_RTS        0xB
 #define        CTRL_CTS        0xC


@@ -79,14 +83,32 @@
 #define        CTRL_CF_END     0xE
 #define        CTRL_END_ACK    0xF
 
 #define        CTRL_CF_END     0xE
 #define        CTRL_END_ACK    0xF
 

-#define        DATA_DATA               0x0
-#define        DATA_DATA_CF_ACK        0x1
-#define        DATA_DATA_CF_POLL       0x2
-#define        DATA_DATA_CF_ACK_POLL   0x3
-#define        DATA_NODATA             0x4
-#define        DATA_NODATA_CF_ACK      0x5
-#define        DATA_NODATA_CF_POLL     0x6
-#define        DATA_NODATA_CF_ACK_POLL 0x7
+#define        DATA_DATA                       0x0
+#define        DATA_DATA_CF_ACK                0x1
+#define        DATA_DATA_CF_POLL               0x2
+#define        DATA_DATA_CF_ACK_POLL           0x3
+#define        DATA_NODATA                     0x4
+#define        DATA_NODATA_CF_ACK              0x5
+#define        DATA_NODATA_CF_POLL             0x6
+#define        DATA_NODATA_CF_ACK_POLL         0x7
+
+#define DATA_QOS_DATA                  0x8
+#define DATA_QOS_DATA_CF_ACK           0x9
+#define DATA_QOS_DATA_CF_POLL          0xA
+#define DATA_QOS_DATA_CF_ACK_POLL      0xB
+#define DATA_QOS_NODATA                        0xC
+#define DATA_QOS_CF_POLL_NODATA                0xE
+#define DATA_QOS_CF_ACK_POLL_NODATA    0xF
+
+/*
+ * The subtype field of a data frame is, in effect, composed of 4 flag
+ * bits - CF-Ack, CF-Poll, Null (means the frame doesn't actually have
+ * any data), and QoS.
+ */
+#define DATA_FRAME_IS_CF_ACK(x)                ((x) & 0x01)
+#define DATA_FRAME_IS_CF_POLL(x)       ((x) & 0x02)
+#define DATA_FRAME_IS_NULL(x)          ((x) & 0x04)
+#define DATA_FRAME_IS_QOS(x)           ((x) & 0x08)

 
 /*
  * Bits in the frame control field.
 
 /*
  * Bits in the frame control field.


@@ -122,12 +144,6 @@ struct mgmt_header_t {
 #define        CAPABILITY_CFP_REQ(cap) ((cap) & 0x0008)
 #define        CAPABILITY_PRIVACY(cap) ((cap) & 0x0010)
 
 #define        CAPABILITY_CFP_REQ(cap) ((cap) & 0x0008)
 #define        CAPABILITY_PRIVACY(cap) ((cap) & 0x0010)
 

-typedef enum {
-       NOT_PRESENT,
-       PRESENT,
-       TRUNCATED
-} elem_status_t;
-

 struct ssid_t {
        u_int8_t        element_id;
        u_int8_t        length;
 struct ssid_t {
        u_int8_t        element_id;
        u_int8_t        length;


@@ -215,20 +231,20 @@ struct mgmt_body_t {
        u_int16_t       reason_code;
        u_int16_t       auth_alg;
        u_int16_t       auth_trans_seq_num;
        u_int16_t       reason_code;
        u_int16_t       auth_alg;
        u_int16_t       auth_trans_seq_num;

-       elem_status_t   challenge_status;
+       int             challenge_present;

        struct challenge_t  challenge;
        u_int16_t       capability_info;
        struct challenge_t  challenge;
        u_int16_t       capability_info;

-       elem_status_t   ssid_status;
+       int             ssid_present;

        struct ssid_t   ssid;
        struct ssid_t   ssid;

-       elem_status_t   rates_status;
+       int             rates_present;

        struct rates_t  rates;
        struct rates_t  rates;

-       elem_status_t   ds_status;
+       int             ds_present;

        struct ds_t     ds;
        struct ds_t     ds;

-       elem_status_t   cf_status;
+       int             cf_present;

        struct cf_t     cf;
        struct cf_t     cf;

-       elem_status_t   fh_status;
+       int             fh_present;

        struct fh_t     fh;
        struct fh_t     fh;

-       elem_status_t   tim_status;
+       int             tim_present;

        struct tim_t    tim;
 };
 
        struct tim_t    tim;
 };
 


@@ -294,6 +310,38 @@ struct ctrl_end_ack_t {
 #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];
+};
+
+#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];
+};
+
+#define        CTRL_BAR_HDRLEN         (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
+                                IEEE802_11_RA_LEN+IEEE802_11_TA_LEN+\
+                                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];
+};
+

 #define        IV_IV(iv)       ((iv) & 0xFFFFFF)
 #define        IV_PAD(iv)      (((iv) >> 24) & 0x3F)
 #define        IV_KEYID(iv)    (((iv) >> 30) & 0x03)
 #define        IV_IV(iv)       ((iv) & 0xFFFFFF)
 #define        IV_PAD(iv)      (((iv) >> 24) & 0x3F)
 #define        IV_KEYID(iv)    (((iv) >> 30) & 0x03)