- use proper signedness

[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 3f8e824049175a45a6f9b9ef44277b5982961c73..c265edcab28c6a82f9c372f96ad1733d23309a9e 100644 (file)
--- a/src/transport/plugin_transport_wlan.h
+++ b/src/transport/plugin_transport_wlan.h
@@ -26,13 +26,37 @@
 #ifndef PLUGIN_TRANSPORT_WLAN
 #define PLUGIN_TRANSPORT_WLAN
 
-#include <stdint.h>
+#include "gnunet_crypto_lib.h"
 #include "gnunet_common.h"
 
 /**
  * Number fo bytes in a mac address.
  */
-#define MAC_ADDR_SIZE 6
+#ifdef MINGW
+  #define MAC_ADDR_SIZE 8
+  typedef uint8_t u_int8_t;
+#else
+  #define MAC_ADDR_SIZE 6
+#endif
+
+/**
+ * Value for "Management" in the 'frame_control' field of the
+ * struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame.
+ */
+#define IEEE80211_FC0_TYPE_MGT                  0x00
+
+/**
+ * Value for "Control" in the 'frame_control' field of the
+ * struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame.
+ */
+#define IEEE80211_FC0_TYPE_CTL                  0x04
+
+/**
+ * Value for DATA in the 'frame_control' field of the
+ * struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame.
+ */
+#define IEEE80211_FC0_TYPE_DATA                 0x08
+
 
 GNUNET_NETWORK_STRUCT_BEGIN
 
@@ -61,6 +85,29 @@ struct GNUNET_TRANSPORT_WLAN_HelperControlMessage
   struct GNUNET_TRANSPORT_WLAN_MacAddress mac;
 };
 
+/**
+ * generic definitions for IEEE 802.3 frames
+ */
+struct GNUNET_TRANSPORT_WLAN_Ieee8023Frame
+{
+
+  /**
+   * Address 1: destination address in ad-hoc mode or AP, BSSID if station,
+   */
+  struct GNUNET_TRANSPORT_WLAN_MacAddress dst;
+
+  /**
+   * Address 2: source address if in ad-hoc-mode or station, BSSID if AP
+   */
+  struct GNUNET_TRANSPORT_WLAN_MacAddress src;
+
+  /**
+   * Packet type ID.
+   */
+  uint16_t type;
+
+};
+
 
 /**
  * generic definitions for IEEE 802.11 frames
@@ -68,7 +115,13 @@ struct GNUNET_TRANSPORT_WLAN_HelperControlMessage
 struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame
 {
   /**
-   * 802.11 Frame Control field,
+   * 802.11 Frame Control field.  A bitmask.  The overall field is a
+   * 16-bit mask of the respecitve fields.  The lowest two bits should
+   * be 0, then comes the "type" (2 bits, see IEEE80211_FC0_TYPE_*
+   * constants), followed by 4-bit subtype (all zeros for ad-hoc),
+   * followed by various flags (to DS, from DS, more frag, retry,
+   * power management, more data, WEP, strict), all of which we also
+   * keep at zero.
    */
   uint16_t frame_control GNUNET_PACKED;
 
@@ -93,7 +146,8 @@ struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame
   struct GNUNET_TRANSPORT_WLAN_MacAddress addr3;
 
   /**
-   * 802.11 sequence control field.
+   * 802.11 sequence control field; contains fragment number an sequence
+   * number (we set this to all zeros).
    */
   uint16_t sequence_control GNUNET_PACKED;
 
@@ -116,7 +170,7 @@ struct GNUNET_TRANSPORT_WLAN_RadiotapSendMessage
 {
 
   /**
-   * Type is 'GNUNET_MESSAGE_TYPE_WLAN_HELPER_DATA'.
+   * Type is 'GNUNET_MESSAGE_TYPE_WLAN_DATA_TO_HELPER'.
    */
   struct GNUNET_MessageHeader header;
 
@@ -157,51 +211,51 @@ struct GNUNET_TRANSPORT_WLAN_RadiotapReceiveMessage
 {
 
   /**
-   * Type is 'GNUNET_MESSAGE_TYPE_WLAN_HELPER_DATA'.
+   * Type is 'GNUNET_MESSAGE_TYPE_WLAN_DATA_FROM_HELPER'.
    */
   struct GNUNET_MessageHeader header;
 
   /**
-   * FIXME: not initialized properly so far. (supposed to contain
-   * information about which of the fields below are actually valid).
+   * Information about which of the fields below are actually valid.
+   * 0 for none.  FIXME: not properly initialized so far (always zero).
    */
   uint32_t ri_present GNUNET_PACKED;
 
   /**
-   * IEEE80211_RADIOTAP_TSFT
+   * IEEE80211_RADIOTAP_TSFT, 0 if unknown.
    */
   uint64_t ri_mactime GNUNET_PACKED;
 
   /**
    * from radiotap
    * either IEEE80211_RADIOTAP_DBM_ANTSIGNAL
-   * or IEEE80211_RADIOTAP_DB_ANTSIGNAL
+   * or IEEE80211_RADIOTAP_DB_ANTSIGNAL, 0 if unknown.
    */
   int32_t ri_power GNUNET_PACKED;
 
   /**
    * either IEEE80211_RADIOTAP_DBM_ANTNOISE
-   * or IEEE80211_RADIOTAP_DB_ANTNOISE
+   * or IEEE80211_RADIOTAP_DB_ANTNOISE, 0 if unknown.
    */
   int32_t ri_noise GNUNET_PACKED;
 
   /**
-   * IEEE80211_RADIOTAP_CHANNEL
+   * IEEE80211_RADIOTAP_CHANNEL, 0 if unknown.
    */
   uint32_t ri_channel GNUNET_PACKED;
 
   /**
-   * Frequency we use.  FIXME: not properly initialized so far!
+   * Frequency we use.  0 if unknown.
    */
   uint32_t ri_freq GNUNET_PACKED;
 
   /**
-   * IEEE80211_RADIOTAP_RATE * 50000
+   * IEEE80211_RADIOTAP_RATE * 50000, 0 if unknown.
    */
   uint32_t ri_rate GNUNET_PACKED;
 
   /**
-   * IEEE80211_RADIOTAP_ANTENNA
+   * IEEE80211_RADIOTAP_ANTENNA, 0 if unknown.
    */
   uint32_t ri_antenna GNUNET_PACKED;