(no commit message)

[oweals/gnunet.git] / src / transport / gnunet-transport-wlan-helper.c

diff --git a/src/transport/gnunet-transport-wlan-helper.c b/src/transport/gnunet-transport-wlan-helper.c
index 4edbb6b70366ae6b121806e4bb3a7482b7843f18..7556e66639b6ee292201fdf4e3f11bcd398a4e42 100644 (file)
--- a/src/transport/gnunet-transport-wlan-helper.c
+++ b/src/transport/gnunet-transport-wlan-helper.c
@@ -28,17 +28,16 @@
  * gnunet
  */
 #include "gnunet-transport-wlan-helper.h"
+#include "plugin_transport_wlan.h"
 #include "ieee80211_radiotap.h"
 
 #include <pcap.h>
 
 //#include "radiotap.h"
 
-// broadcast mac
-static const char macbc[] = "13223344";
-
 // mac of this node
-char mac[] = "13223355";
+char mac[] =
+  { 0x13, 0x22, 0x33, 0x44, 0x55, 0x66 };
 
 /* wifi bitrate to use in 500kHz units */
 
@@ -57,31 +56,6 @@ static const u8 u8aRatesToUse[] = {
        1*2
 };
 
-/* Penumbra IEEE80211 header */
-static const u8 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,
-};
-
-/* this is the template radiotap header we send packets out with */
-
-static const u8 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
-
-};
 #define        OFFSET_FLAGS 0x10
 #define        OFFSET_RATE 0x11
 
@@ -265,7 +239,7 @@ int ieee80211_radiotap_iterator_init(
  * ieee80211_radiotap_iterator_next - return next radiotap parser iterator arg
  * @param iterator: radiotap_iterator to move to next arg (if any)
  *
- * @eturn 0 if there is an argument to handle,
+ * @return 0 if there is an argument to handle,
  * -ENOENT if there are no more args or -EINVAL
  * if there is something else wrong.
  *
@@ -555,6 +529,11 @@ main(int argc, char *argv[])
                struct pcap_pkthdr * ppcapPacketHeader = NULL;
                struct ieee80211_radiotap_iterator rti;
                PENUMBRA_RADIOTAP_DATA prd;
+               //init of the values
+               prd.m_nRate = 255;
+               prd.m_nChannel = 255;
+               prd.m_nAntenna = 255;
+               prd.m_nRadiotapFlags = 255;
                u8 * pu8Payload = u8aSendBuffer;
                int n, nRate;