Address Michael's comments.

[tcpdump] / ieee802_11.h

diff --git a/ieee802_11.h b/ieee802_11.h
index 5e29c816093a383aa4436db14637bf255df7d0ff..2aa1345038a25c341fbe56800e01be7712563742 100644 (file)
--- a/ieee802_11.h
+++ b/ieee802_11.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/ieee802_11.h,v 1.7 2003-02-04 05:53:21 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


@@ -21,61 +21,109 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define IEEE802_11_FC_LEN      2
-
-#define T_MGMT 0x0  /* management */
-#define T_CTRL 0x1  /* control */
-#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
+/* Lengths of 802.11 header components. */
+#define        IEEE802_11_FC_LEN               2
+#define        IEEE802_11_DUR_LEN              2
+#define        IEEE802_11_DA_LEN               6
+#define        IEEE802_11_SA_LEN               6
+#define        IEEE802_11_BSSID_LEN            6
+#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
+
+/* Frame check sequence length. */
+#define        IEEE802_11_FCS_LEN              4
+
+/* Lengths of beacon components. */
+#define        IEEE802_11_TSTAMP_LEN           8
+#define        IEEE802_11_BCNINT_LEN           2
+#define        IEEE802_11_CAPINFO_LEN          2
+#define        IEEE802_11_LISTENINT_LEN        2
+
+#define        IEEE802_11_AID_LEN              2
+#define        IEEE802_11_STATUS_LEN           2
+#define        IEEE802_11_REASON_LEN           2
+
+/* Length of previous AP in reassocation frame */
+#define        IEEE802_11_AP_LEN               6
+
+#define        T_MGMT 0x0  /* management */
+#define        T_CTRL 0x1  /* control */
+#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  */
 /* RESERVED                    0x6  */
 /* RESERVED                    0x7  */

-#define ST_BEACON              0x8
-#define ST_ATIM                        0x9
-#define ST_DISASSOC            0xA
-#define ST_AUTH                        0xB
-#define ST_DEAUTH              0xC
-/* RESERVED                    0xD  */
+#define        ST_BEACON               0x8
+#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  */
 
 

-#define CTRL_PS_POLL   0xA
-#define CTRL_RTS       0xB
-#define CTRL_CTS       0xC
-#define CTRL_ACK       0xD
-#define CTRL_CF_END    0xE
-#define CTRL_END_ACK   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_ACK        0xD
+#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_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

 
 

-#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
+/*
+ * 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.
  */

-#define FC_VERSION(fc)         ((fc) & 0x3)
-#define FC_TYPE(fc)            (((fc) >> 2) & 0x3)
-#define FC_SUBTYPE(fc)         (((fc) >> 4) & 0xF)
-#define FC_TO_DS(fc)           ((fc) & 0x0100)
-#define FC_FROM_DS(fc)         ((fc) & 0x0200)
-#define FC_MORE_FLAG(fc)       ((fc) & 0x0400)
-#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_ORDER(fc)           ((fc) & 0x8000)
+#define        FC_VERSION(fc)          ((fc) & 0x3)
+#define        FC_TYPE(fc)             (((fc) >> 2) & 0x3)
+#define        FC_SUBTYPE(fc)          (((fc) >> 4) & 0xF)
+#define        FC_TO_DS(fc)            ((fc) & 0x0100)
+#define        FC_FROM_DS(fc)          ((fc) & 0x0200)
+#define        FC_MORE_FLAG(fc)        ((fc) & 0x0400)
+#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_ORDER(fc)            ((fc) & 0x8000)

 
 struct mgmt_header_t {
        u_int16_t       fc;
 
 struct mgmt_header_t {
        u_int16_t       fc;


@@ -86,13 +134,15 @@ struct mgmt_header_t {
        u_int16_t       seq_ctrl;
 };
 
        u_int16_t       seq_ctrl;
 };
 

-#define MGMT_HEADER_LEN        (2+2+6+6+6+2)
+#define        MGMT_HDRLEN     (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+\
+                        IEEE802_11_DA_LEN+IEEE802_11_SA_LEN+\
+                        IEEE802_11_BSSID_LEN+IEEE802_11_SEQ_LEN)

 
 

-#define CAPABILITY_ESS(cap)    ((cap) & 0x0001)
-#define CAPABILITY_IBSS(cap)   ((cap) & 0x0002)
-#define CAPABILITY_CFP(cap)    ((cap) & 0x0004)
-#define CAPABILITY_CFP_REQ(cap)        ((cap) & 0x0008)
-#define CAPABILITY_PRIVACY(cap)        ((cap) & 0x0010)
+#define        CAPABILITY_ESS(cap)     ((cap) & 0x0001)
+#define        CAPABILITY_IBSS(cap)    ((cap) & 0x0002)
+#define        CAPABILITY_CFP(cap)     ((cap) & 0x0004)
+#define        CAPABILITY_CFP_REQ(cap) ((cap) & 0x0008)
+#define        CAPABILITY_PRIVACY(cap) ((cap) & 0x0010)

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


@@ -103,7 +153,7 @@ struct ssid_t {
 struct rates_t {
        u_int8_t        element_id;
        u_int8_t        length;
 struct rates_t {
        u_int8_t        element_id;
        u_int8_t        length;

-       u_int8_t        rate[8];
+       u_int8_t        rate[16];

 };
 
 struct challenge_t {
 };
 
 struct challenge_t {


@@ -111,6 +161,7 @@ struct challenge_t {
        u_int8_t        length;
        u_int8_t        text[254]; /* 1-253 + 1 for null */
 };
        u_int8_t        length;
        u_int8_t        text[254]; /* 1-253 + 1 for null */
 };

+

 struct fh_t {
        u_int8_t        element_id;
        u_int8_t        length;
 struct fh_t {
        u_int8_t        element_id;
        u_int8_t        length;


@@ -144,13 +195,13 @@ struct tim_t {
        u_int8_t        bitmap[251];
 };
 
        u_int8_t        bitmap[251];
 };
 

-#define E_SSID                 0
-#define E_RATES        1
-#define E_FH           2
-#define E_DS           3
-#define E_CF           4
-#define E_TIM          5
-#define E_IBSS                 6
+#define        E_SSID          0
+#define        E_RATES         1
+#define        E_FH            2
+#define        E_DS            3
+#define        E_CF            4
+#define        E_TIM           5
+#define        E_IBSS          6

 /* reserved            7 */
 /* reserved            8 */
 /* reserved            9 */
 /* reserved            7 */
 /* reserved            8 */
 /* reserved            9 */


@@ -162,7 +213,7 @@ struct tim_t {
 /* reserved            15 */
 /* reserved            16 */
 
 /* reserved            15 */
 /* reserved            16 */
 

-#define E_CHALLENGE    16
+#define        E_CHALLENGE     16

 /* reserved            17 */
 /* reserved            18 */
 /* reserved            19 */
 /* reserved            17 */
 /* reserved            18 */
 /* reserved            19 */


@@ -171,22 +222,29 @@ struct tim_t {
 
 
 struct mgmt_body_t {
 
 
 struct mgmt_body_t {

-       u_int8_t        timestamp[8];
+       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;
        u_int16_t       beacon_interval;
        u_int16_t       listen_interval;
        u_int16_t       status_code;
        u_int16_t       aid;

-       u_char          ap[6];
+       u_char          ap[IEEE802_11_AP_LEN];

        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;

+       int             challenge_present;

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

+       int             ssid_present;

        struct ssid_t   ssid;
        struct ssid_t   ssid;

+       int             rates_present;

        struct rates_t  rates;
        struct rates_t  rates;

+       int             ds_present;

        struct ds_t     ds;
        struct ds_t     ds;

+       int             cf_present;

        struct cf_t     cf;
        struct cf_t     cf;

+       int             fh_present;

        struct fh_t     fh;
        struct fh_t     fh;

+       int             tim_present;

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


@@ -198,7 +256,8 @@ struct ctrl_rts_t {
        u_int8_t        fcs[4];
 };
 
        u_int8_t        fcs[4];
 };
 

-#define CTRL_RTS_LEN   (2+2+6+6+4)
+#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;
 
 struct ctrl_cts_t {
        u_int16_t       fc;


@@ -207,7 +266,7 @@ struct ctrl_cts_t {
        u_int8_t        fcs[4];
 };
 
        u_int8_t        fcs[4];
 };
 

-#define CTRL_CTS_LEN   (2+2+6+4)
+#define        CTRL_CTS_HDRLEN (IEEE802_11_FC_LEN+IEEE802_11_DUR_LEN+IEEE802_11_RA_LEN)

 
 struct ctrl_ack_t {
        u_int16_t       fc;
 
 struct ctrl_ack_t {
        u_int16_t       fc;


@@ -216,7 +275,7 @@ struct ctrl_ack_t {
        u_int8_t        fcs[4];
 };
 
        u_int8_t        fcs[4];
 };
 

-#define CTRL_ACK_LEN   (2+2+6+4)
+#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;
 
 struct ctrl_ps_poll_t {
        u_int16_t       fc;


@@ -226,7 +285,8 @@ struct ctrl_ps_poll_t {
        u_int8_t        fcs[4];
 };
 
        u_int8_t        fcs[4];
 };
 

-#define CTRL_PS_POLL_LEN       (2+2+6+6+4)
+#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;
 
 struct ctrl_end_t {
        u_int16_t       fc;


@@ -236,7 +296,8 @@ struct ctrl_end_t {
        u_int8_t        fcs[4];
 };
 
        u_int8_t        fcs[4];
 };
 

-#define CTRL_END_LEN   (2+2+6+6+4)
+#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;
 
 struct ctrl_end_ack_t {
        u_int16_t       fc;


@@ -246,8 +307,41 @@ struct ctrl_end_ack_t {
        u_int8_t        fcs[4];
 };
 
        u_int8_t        fcs[4];
 };
 

-#define CTRL_END_ACK_LEN       (2+2+6+6+4)
+#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)