summaryrefslogtreecommitdiff
path: root/src/transport/plugin_transport_wlan.h
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-09-24 08:44:05 +0000
committerChristian Grothoff <christian@grothoff.org>2010-09-24 08:44:05 +0000
commitf5db837f7992ea5276bbee9f74bc3a622dd0e354 (patch)
treed239b2595dda12f814f429a9a2a469d76f9ec8de /src/transport/plugin_transport_wlan.h
parentffc8efb1039f1a96c415ddeec1854aec9d09e896 (diff)
fixing warnings
Diffstat (limited to 'src/transport/plugin_transport_wlan.h')
-rw-r--r--src/transport/plugin_transport_wlan.h188
1 files changed, 94 insertions, 94 deletions
diff --git a/src/transport/plugin_transport_wlan.h b/src/transport/plugin_transport_wlan.h
index c870e4d65..dc30b5ff3 100644
--- a/src/transport/plugin_transport_wlan.h
+++ b/src/transport/plugin_transport_wlan.h
@@ -30,13 +30,14 @@ 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,
-};
+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,
+ };
/**
* Wlan header
@@ -44,103 +45,102 @@ 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
+ */
+ uint32_t flags;
+
+ /**
+ * first mac
+ */
+ uint8_t mac1[6];
+
+ /**
+ * second mac
+ */
+ uint8_t mac2[6];
+
+ /**
+ * third mac
+ */
+ uint8_t mac3[6];
+
+ /**
+ * Wlan flags2
+ */
+ uint16_t flags2;
};
/* 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;
};