diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-03-16 20:52:52 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-03-16 20:52:52 +0000 |
commit | dc2e456d8e2689e212366260ffa2f09f86e9420b (patch) | |
tree | 5a50753999e4d3da4282d706928e3639fdcd9763 /src/transport/plugin_transport_wlan.c | |
parent | 545bab0e7bdbe2ba730c22a5f486c3ad0880d3de (diff) | |
download | gnunet-dc2e456d8e2689e212366260ffa2f09f86e9420b.tar.gz gnunet-dc2e456d8e2689e212366260ffa2f09f86e9420b.zip |
-fixing misc. bugs and making wlan helper auditable, resolving #1939
Diffstat (limited to 'src/transport/plugin_transport_wlan.c')
-rw-r--r-- | src/transport/plugin_transport_wlan.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c index 7b709ce9d..0c60bd68c 100644 --- a/src/transport/plugin_transport_wlan.c +++ b/src/transport/plugin_transport_wlan.c | |||
@@ -93,6 +93,7 @@ | |||
93 | * max messages in in queue | 93 | * max messages in in queue |
94 | */ | 94 | */ |
95 | #define MESSAGES_IN_QUEUE_SIZE 10 | 95 | #define MESSAGES_IN_QUEUE_SIZE 10 |
96 | |||
96 | /** | 97 | /** |
97 | * max messages in in queue per session/client | 98 | * max messages in in queue per session/client |
98 | */ | 99 | */ |
@@ -106,17 +107,6 @@ | |||
106 | #define WLAN_LLC_SSAP_FIELD 0x1f | 107 | #define WLAN_LLC_SSAP_FIELD 0x1f |
107 | 108 | ||
108 | 109 | ||
109 | #define IEEE80211_ADDR_LEN 6 /* size of 802.11 address */ | ||
110 | |||
111 | #define IEEE80211_FC0_VERSION_MASK 0x03 | ||
112 | #define IEEE80211_FC0_VERSION_SHIFT 0 | ||
113 | #define IEEE80211_FC0_VERSION_0 0x00 | ||
114 | #define IEEE80211_FC0_TYPE_MASK 0x0c | ||
115 | #define IEEE80211_FC0_TYPE_SHIFT 2 | ||
116 | #define IEEE80211_FC0_TYPE_MGT 0x00 | ||
117 | #define IEEE80211_FC0_TYPE_CTL 0x04 | ||
118 | #define IEEE80211_FC0_TYPE_DATA 0x08 | ||
119 | |||
120 | 110 | ||
121 | /** | 111 | /** |
122 | * Encapsulation of all of the state of the plugin. | 112 | * Encapsulation of all of the state of the plugin. |
@@ -1266,7 +1256,7 @@ getWlanHeader (struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame *Header, | |||
1266 | { | 1256 | { |
1267 | const int rate = 11000000; | 1257 | const int rate = 11000000; |
1268 | 1258 | ||
1269 | Header->frame_control = htons (IEEE80211_FC0_TYPE_DATA); // FIXME: check: might need to shift by 8? | 1259 | Header->frame_control = htons (IEEE80211_FC0_TYPE_DATA); |
1270 | Header->addr1 = *to_mac_addr; | 1260 | Header->addr1 = *to_mac_addr; |
1271 | Header->addr2 = plugin->mac_address; | 1261 | Header->addr2 = plugin->mac_address; |
1272 | Header->addr3 = mac_bssid_gnunet; | 1262 | Header->addr3 = mac_bssid_gnunet; |