- add classes for 802.11 tagged values

- adjust miniwellenreiter accordingly

1 files changed, 31 insertions, 23 deletions

diff --git a/libopie2/opienet/802_11_user.h b/libopie2/opienet/802_11_user.h
index 0b3f198..ffdcb93 100644
--- a/libopie2/opienet/802_11_user.h
+++ b/libopie2/opienet/802_11_user.h
@@ -246,29 +246,29 @@ struct ieee_802_11_mgmt_header {
 struct ieee_802_11_data_header {
                 u_int16_tframe_control;
                 u_int16_tduration;
                 u_int8_tmac1[6];
                 u_int8_tmac2[6];
                 u_int8_tmac3[6];
                 u_int16_tSeqCtl;
                 u_int8_tmac4[6];
         //      u_int16_tgapLen;
         //      u_int8_tgap[8];
 };
 
-        #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_telement_id;
           u_int8_tlength;
           u_char        ssid[33];  /* 32 + 1 for null */
 };
 
 
 struct rates_t {
           u_int8_telement_id;
           u_int8_tlength;
           u_int8_trate[8];
@@ -309,53 +309,61 @@ struct cf_t {
 };
 
 
 struct tim_t {
           u_int8_telement_id;
           u_int8_tlength;
           u_int8_tcount;
           u_int8_tperiod;
           u_int8_tbitmap_control;
           u_int8_tbitmap[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_CHALLENGE 16
-        #define E_CISCO         133
+
+struct ibss_t {
+          u_int8_telement_id;
+          u_int8_tlength;
+          u_int16_tatim_window;
+};
+
+
+#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_CHALLENGE 16
+#define E_CISCO     133
 
 
 struct ieee_802_11_mgmt_body {
-          u_int8_t   timestamp[8];
-          u_int16_t  beacon_interval;
+  u_int8_t  timestamp[8];
+  u_int16_t beacon_interval;
         //  u_int16_t listen_interval;
         //  u_int16_t status_code;
         //  u_int16_t aid;
         //  u_char      ap[6];
         //  u_int16_treason_code;
         //  u_int16_tauth_alg;
         //  u_int16_tauth_trans_seq_num;
 //  struct challenge_t  challenge;
-          u_int16_tcapability_info;
-          struct ssid_tssid;
-          struct rates_t rates;
-          struct ds_tds;
-          struct cf_tcf;
-          struct fh_tfh;
-          struct tim_ttim;
+  u_int16_t capability_info;
+        //  struct ssid_tssid;
+        //  struct rates_t rates;
+        //  struct ds_tds;
+        //  struct cf_tcf;
+        //  struct fh_tfh;
+        //  struct tim_ttim;
 };
 
 
 struct ieee_802_11_data_body {
 //FIXME
 };
 
 struct ctrl_rts_t {
           u_int16_tfc;
           u_int16_tduration;
           u_int8_tra[6];
           u_int8_tta[6];