safety check

[oweals/gnunet.git] / src / transport / plugin_transport_wlan.h

diff --git a/src/transport/plugin_transport_wlan.h b/src/transport/plugin_transport_wlan.h
index c870e4d657f9372eeb7cf40c4027707e21facd4d..3c206a496e5b31d22719d8b805b46ce669186fb4 100644 (file)
--- a/src/transport/plugin_transport_wlan.h
+++ b/src/transport/plugin_transport_wlan.h
@@ -24,19 +24,35 @@
  * @author David Brodski
  */
 
+#ifndef PLUGIN_TRANSPORT_WLAN
+#define PLUGIN_TRANSPORT_WLAN
+
 #include "gnunet_common.h"
 
 typedef unsigned int uint32_t;
 typedef unsigned short uint16_t;
 
 /* Wlan IEEE80211 header default */
-static const uint8_t u8aIeeeHeader[] = {
-       0x08, 0x01, 0x00, 0x00,
-       0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-       0x13, 0x22, 0x33, 0x44, 0x55, 0x66,
-       0x13, 0x22, 0x33, 0x44, 0x55, 0x66,
-       0x10, 0x86,
-};
+//Informations (in German) http://www.umtslink.at/content/WLAN_macheader-196.html
+static const uint8_t u8aIeeeHeader[] = 
+  {
+    0x08, 0x01, // Frame Control 0x08= 00001000 -> | b1,2 = 0 -> Version 0;
+                //      b3,4 = 10 -> Data; b5-8 = 0 -> Normal Data
+               //      0x01 = 00000001 -> | b1 = 1 to DS; b2 = 0 not from DS;
+    0x00, 0x00, // Duration/ID
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // mac1 - in this case receiver
+    0x13, 0x22, 0x33, 0x44, 0x55, 0x66, // mac2 - in this case bssid
+    0x13, 0x22, 0x33, 0x44, 0x55, 0x66, // mac3 - in this case sender
+    0x10, 0x86, //Sequence Control
+  };
+
+// gnunet bssid
+static const char macbc[] =
+  { 0x13, 0x22, 0x33, 0x44, 0x55, 0x66 };
+
+// broadcast mac
+static const char bc_all_mac[] =
+   { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
 
 /**
  * Wlan header
@@ -44,103 +60,110 @@ static const uint8_t u8aIeeeHeader[] = {
 
 struct IeeeHeader
 {
-       /**
-        * Wlan flags
-        */
-       uint8_t flags[4] GNUNET_PACKED;
-
-       /**
-        * first mac
-        */
-       uint8_t mac1[6] GNUNET_PACKED;
-
-       /**
-        * second mac
-        */
-       uint8_t mac2[6] GNUNET_PACKED;
-
-       /**
-        * third mac
-        */
-       uint8_t mac3[6] GNUNET_PACKED;
-
-       /**
-        * Wlan flags2
-        */
-       uint8_t flags2[2] GNUNET_PACKED;
+  /**
+   * Wlan flags
+   */
+  uint16_t frame_control GNUNET_PACKED;
+
+  /**
+   * Duration / ID
+   */
+
+  uint16_t duration_id GNUNET_PACKED;
+  
+  /**
+   * first mac byte 1
+   */
+  uint8_t mac1[6];
+
+  
+  /**
+   * second mac
+   */
+  uint8_t mac2[6];
+  
+  /**
+   * third mac
+   */
+  uint8_t mac3[6];
+  
+  /**
+   * Wlan Sequence Control
+   */
+  uint16_t sequence_control GNUNET_PACKED;
 };
 
 /* this is the template radiotap header we send packets out with */
 
-static const uint8_t u8aRadiotapHeader[] = {
-
-       0x00, 0x00, // <-- radiotap version
-       0x19, 0x00, // <- radiotap header length
-       0x6f, 0x08, 0x00, 0x00, // <-- bitmap
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // <-- timestamp
-       0x00, // <-- flags (Offset +0x10)
-       0x6c, // <-- rate (0ffset +0x11)
-       0x71, 0x09, 0xc0, 0x00, // <-- channel
-       0xde, // <-- antsignal
-       0x00, // <-- antnoise
-       0x01, // <-- antenna
-
+static const uint8_t u8aRadiotapHeader[] = 
+  {
+    0x00, 0x00, // <-- radiotap version
+    0x19, 0x00, // <- radiotap header length
+    0x6f, 0x08, 0x00, 0x00, // <-- bitmap
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // <-- timestamp
+    0x00, // <-- flags (Offset +0x10)
+    0x6c, // <-- rate (0ffset +0x11)
+    0x71, 0x09, 0xc0, 0x00, // <-- channel
+    0xde, // <-- antsignal
+    0x00, // <-- antnoise
+    0x01, // <-- antenna
 };
 
 /**
  * Radiotap Header
  */
-
 struct RadiotapHeader
 {
-       /**
-        * radiotap version
-        */
-       uint8_t version[2] GNUNET_PACKED;
-
-       /**
-        * radiotap header length
-        */
-       uint8_t lenght[2] GNUNET_PACKED;
-
-       /**
-        * bitmap
-        */
-       uint8_t bitmap[4] GNUNET_PACKED;
-
-       /**
-        * timestamp
-        */
-       uint8_t timestamp[8] GNUNET_PACKED;
-
-       /**
-        * radiotap flags
-        */
-       uint8_t flags GNUNET_PACKED;
-
-       /**
-        * wlan send rate
-        */
-       uint8_t rate GNUNET_PACKED;
-
-       /**
-        * Wlan channel
-        */
-       uint8_t channel[4] GNUNET_PACKED;
-
-       /**
-        * antsignal
-        */
-       uint8_t antsignal GNUNET_PACKED;
-
-       /**
-        * antnoise
-        */
-       uint8_t antnoise GNUNET_PACKED;
-
-       /**
-        * antenna
-        */
-       uint8_t antenna GNUNET_PACKED;
+  /**
+   * radiotap version
+   */
+  uint16_t version GNUNET_PACKED;
+  
+  /**
+   * radiotap header length
+   */
+  uint16_t length GNUNET_PACKED;
+  
+  /**
+   * bitmap
+   */
+  uint32_t bitmap GNUNET_PACKED;
+  
+  /**
+   * timestamp
+   */
+  uint64_t timestamp GNUNET_PACKED;
+  
+  /**
+   * radiotap flags
+   */
+  uint8_t flags;
+  
+  /**
+   * wlan send rate
+   */
+  uint8_t rate;
+  
+  // FIXME: unaligned here, is this OK?
+  /**
+   * Wlan channel
+   */
+  uint32_t channel GNUNET_PACKED;
+  
+  /**
+   * antsignal
+   */
+  uint8_t antsignal;
+  
+  /**
+   * antnoise
+   */
+  uint8_t antnoise;
+  
+  /**
+   * antenna
+   */
+  uint8_t antenna;
 };
 
+#endif