Changeset 9e5a51c in mainline for uspace/lib/net/include/ieee80211.h

Timestamp:

2015-03-08T22:20:34Z (9 years ago)

Author:

Jan Kolarik <kolarik@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

864762a

Parents:

4cb0148

Message:

Fixed PLL initialization value that blocked communication with external devices. Started implementing IEEE802.11 scanning and authentication functions.

File:

• uspace/lib/net/include/ieee80211.h (modified) (6 diffs)

uspace/lib/net/include/ieee80211.h

@@ -52 +52 @@
 #define IEEE80211_CHANNEL_GAP 5
 
-#define IEEE80211_FRAME_CTRL_FRAME_TYPE 0x000C
-#define IEEE80211_FRAME_CTRL_DATA_FRAME 0x0008
-
 struct ieee80211_dev;
 
@@ -65 +62 @@
 } ieee80211_operating_mode_t;
 
+/** IEEE 802.11 frame types. */
+typedef enum {
+        IEEE80211_MGMT_FRAME = 0x0,
+        IEEE80211_CTRL_FRAME = 0x4,
+        IEEE80211_DATA_FRAME = 0x8,
+        IEEE80211_EXT_FRAME = 0xC
+} ieee80211_frame_type_t;
+
+/** IEEE 802.11 frame subtypes. */
+typedef enum {
+        IEEE80211_MGMT_ASSOC_REQ_FRAME = 0x00,
+        IEEE80211_MGMT_ASSOC_RESP_FRAME = 0x10,
+        IEEE80211_MGMT_REASSOC_REQ_FRAME = 0x20,
+        IEEE80211_MGMT_REASSOC_RESP_FRAME = 0x30,
+        IEEE80211_MGMT_PROBE_REQ_FRAME = 0x40,
+        IEEE80211_MGMT_PROBE_RESP_FRAME = 0x50,
+        IEEE80211_MGMT_BEACON_FRAME = 0x80,
+        IEEE80211_MGMT_DIASSOC_FRAME = 0xA0,
+        IEEE80211_MGMT_AUTH_FRAME = 0xB0,
+        IEEE80211_MGMT_DEAUTH_FRAME = 0xC0,
+} ieee80211_frame_subtype_t;
+
+/** IEEE 802.11 information element types. */
+typedef enum {
+        IEEE80211_SSID_IE = 0,          /**< Target SSID. */
+        IEEE80211_RATES_IE = 1,         /**< Supported data rates. */
+        IEEE80211_CHANNEL_IE = 3,       /**< Current channel number. */
+        IEEE80211_EXT_RATES_IE = 50     /**< Extended data rates. */
+} ieee80211_ie_type_t;
+
 /** IEEE 802.11 functions. */
 typedef struct {
@@ -70 +97 @@
         int (*scan)(struct ieee80211_dev *);
         int (*tx_handler)(struct ieee80211_dev *, void *, size_t);
+        int (*set_freq)(struct ieee80211_dev *, uint16_t);
 } ieee80211_ops_t;
 
@@ -89 +117 @@
         ieee80211_operating_mode_t current_op_mode;
         
+        /** BSSIDs we listen to. */
+        uint8_t bssid_mask[ETH_ADDR];
+        
         /* TODO: Probably to be removed later - nic.open function is now 
          * executed multiple times, have to find out reason and fix it. 
@@ -96 +127 @@
 } ieee80211_dev_t;
 
-/** IEEE 802.11 header structure. */
+/** IEEE 802.11 management header structure. */
+typedef struct {
+        uint16_t frame_ctrl;            /**< Little Endian value! */
+        uint16_t duration_id;           /**< Little Endian value! */
+        uint8_t dest_addr[ETH_ADDR];
+        uint8_t src_addr[ETH_ADDR];
+        uint8_t bssid[ETH_ADDR];
+        uint16_t seq_ctrl;              /**< Little Endian value! */
+} __attribute__((packed)) __attribute__ ((aligned(2))) ieee80211_mgmt_header_t;
+
+/** IEEE 802.11 data header structure. */
 typedef struct {
         uint16_t frame_ctrl;            /**< Little Endian value! */
@@ -105 +146 @@
         uint16_t seq_ctrl;              /**< Little Endian value! */
         uint8_t address4[ETH_ADDR];
-} __attribute__((packed)) __attribute__ ((aligned(2))) ieee80211_header_t;
+        uint16_t qos_ctrl;              /**< Little Endian value! */
+} __attribute__((packed)) __attribute__ ((aligned(2))) ieee80211_data_header_t;
 
-extern bool ieee80211_is_data_frame(ieee80211_header_t *header);
+/** IEEE 802.11 information element header. */
+typedef struct {
+        uint8_t element_id;
+        uint8_t length;
+} __attribute__((packed)) __attribute__ ((aligned(2))) ieee80211_ie_header_t;
+
+/** IEEE 802.11 authentication frame body. */
+typedef struct {
+        uint16_t auth_alg;              /**< Little Endian value! */
+        uint16_t auth_trans_no;         /**< Little Endian value! */
+        uint16_t status;                /**< Little Endian value! */
+} __attribute__((packed)) __attribute__ ((aligned(2))) ieee80211_auth_body_t;
+
+typedef struct {
+        uint8_t bssid[ETH_ADDR];
+        uint16_t auth_alg;
+} __attribute__((packed)) __attribute__ ((aligned(2))) ieee80211_auth_data_t;
+
 extern int ieee80211_device_init(ieee80211_dev_t *ieee80211_dev, 
         void *driver_data, ddf_dev_t *ddf_dev);
 extern int ieee80211_init(ieee80211_dev_t *ieee80211_dev, 
         ieee80211_ops_t *ieee80211_ops);
+extern int ieee80211_probe_request(ieee80211_dev_t *ieee80211_dev);
+extern int ieee80211_probe_auth(ieee80211_dev_t *ieee80211_dev);
 
 #endif /* LIBNET_IEEE80211_H */