diff options
Diffstat (limited to 'src/transport/plugin_transport_wlan.h')
-rw-r--r-- | src/transport/plugin_transport_wlan.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/transport/plugin_transport_wlan.h b/src/transport/plugin_transport_wlan.h index fb1a7ff57..ac214a07c 100644 --- a/src/transport/plugin_transport_wlan.h +++ b/src/transport/plugin_transport_wlan.h | |||
@@ -54,13 +54,13 @@ static const uint8_t u8aIeeeHeader[] = | |||
54 | // 0x01 = 00000001 -> | b1 = 1 to DS; b2 = 0 not from DS; | 54 | // 0x01 = 00000001 -> | b1 = 1 to DS; b2 = 0 not from DS; |
55 | 0x00, 0x00, // Duration/ID | 55 | 0x00, 0x00, // Duration/ID |
56 | 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // mac1 - in this case receiver | 56 | 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // mac1 - in this case receiver |
57 | 0x13, 0x22, 0x33, 0x44, 0x55, 0x66, // mac2 - in this case bssid | 57 | 0x13, 0x22, 0x33, 0x44, 0x55, 0x66, // mac2 - in this case sender |
58 | 0x13, 0x22, 0x33, 0x44, 0x55, 0x66, // mac3 - in this case sender | 58 | 0x13, 0x22, 0x33, 0x44, 0x55, 0x66, // mac3 - in this case bssid |
59 | 0x10, 0x86, //Sequence Control | 59 | 0x10, 0x86, //Sequence Control |
60 | }; | 60 | }; |
61 | 61 | ||
62 | // gnunet bssid | 62 | // gnunet bssid |
63 | static const char macbc[] = | 63 | static const char mac_bssid[] = |
64 | { 0x13, 0x22, 0x33, 0x44, 0x55, 0x66 }; | 64 | { 0x13, 0x22, 0x33, 0x44, 0x55, 0x66 }; |
65 | 65 | ||
66 | // broadcast mac | 66 | // broadcast mac |
@@ -129,7 +129,9 @@ struct RadiotapHeader | |||
129 | /** | 129 | /** |
130 | * radiotap version | 130 | * radiotap version |
131 | */ | 131 | */ |
132 | uint16_t version GNUNET_PACKED; | 132 | u_int8_t version; |
133 | |||
134 | u_int8_t pad_version; | ||
133 | 135 | ||
134 | /** | 136 | /** |
135 | * radiotap header length | 137 | * radiotap header length |
@@ -137,7 +139,7 @@ struct RadiotapHeader | |||
137 | uint16_t length GNUNET_PACKED; | 139 | uint16_t length GNUNET_PACKED; |
138 | 140 | ||
139 | /** | 141 | /** |
140 | * bitmap | 142 | * bitmap, fields present |
141 | */ | 143 | */ |
142 | uint32_t bitmap GNUNET_PACKED; | 144 | uint32_t bitmap GNUNET_PACKED; |
143 | 145 | ||