Big cleanup, less source files

3 files changed, 18 insertions, 81 deletions

diff --git a/src/transport/wlan/helper_common.c b/src/transport/wlan/helper_common.c
index d4b1204f6..6a7a5da09 100644
--- a/src/transport/wlan/helper_common.c
+++ b/src/transport/wlan/helper_common.c
@@ -34,90 +34,15 @@
  * @return number of bytes written
  */
 int
-send_mac_to_plugin (char *buffer, uint8_t * mac)
+send_mac_to_plugin (char *buffer, struct MacAddress * mac)
 {
 
   struct Wlan_Helper_Control_Message macmsg;
 
-  memcpy (macmsg.mac.mac, mac, sizeof (struct MacAddress));
+  memcpy (&macmsg.mac,(char *) mac, sizeof (struct MacAddress));
   macmsg.hdr.size = htons (sizeof (struct Wlan_Helper_Control_Message));
   macmsg.hdr.type = htons (GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL);
 
   memcpy (buffer, &macmsg, sizeof (struct Wlan_Helper_Control_Message));
   return sizeof (struct Wlan_Helper_Control_Message);
 }
-
-/*
-   *  Copyright (c) 2008, Thomas d'Otreppe
-   *
-   *  Common OSdep stuff
-   *
-   *  This program is free software; you can redistribute it and/or modify
-   *  it under the terms of the GNU General Public License as published by
-   *  the Free Software Foundation; either version 2 of the License, or
-   *  (at your option) any later version.
-   *
-   *  This program is distributed in the hope that it will be useful,
-   *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-   *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   *  GNU General Public License for more details.
-   *
-   *  You should have received a copy of the GNU General Public License
-   *  along with this program; if not, write to the Free Software
-   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-   */
-
-/**
- * Return the frequency in Mhz from a channel number
- */
-int
-getFrequencyFromChannel (int channel)
-{
-  static int frequencies[] = {
-    -1,                         // No channel 0
-    2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447, 2452, 2457, 2462, 2467,
-    2472, 2484,
-    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, // Nothing from channel 15 to 34 (exclusive)
-    5170, 5175, 5180, 5185, 5190, 5195, 5200, 5205, 5210, 5215, 5220, 5225,
-    5230, 5235, 5240, 5245,
-    5250, 5255, 5260, 5265, 5270, 5275, 5280, 5285, 5290, 5295, 5300, 5305,
-    5310, 5315, 5320, 5325,
-    5330, 5335, 5340, 5345, 5350, 5355, 5360, 5365, 5370, 5375, 5380, 5385,
-    5390, 5395, 5400, 5405,
-    5410, 5415, 5420, 5425, 5430, 5435, 5440, 5445, 5450, 5455, 5460, 5465,
-    5470, 5475, 5480, 5485,
-    5490, 5495, 5500, 5505, 5510, 5515, 5520, 5525, 5530, 5535, 5540, 5545,
-    5550, 5555, 5560, 5565,
-    5570, 5575, 5580, 5585, 5590, 5595, 5600, 5605, 5610, 5615, 5620, 5625,
-    5630, 5635, 5640, 5645,
-    5650, 5655, 5660, 5665, 5670, 5675, 5680, 5685, 5690, 5695, 5700, 5705,
-    5710, 5715, 5720, 5725,
-    5730, 5735, 5740, 5745, 5750, 5755, 5760, 5765, 5770, 5775, 5780, 5785,
-    5790, 5795, 5800, 5805,
-    5810, 5815, 5820, 5825, 5830, 5835, 5840, 5845, 5850, 5855, 5860, 5865,
-    5870, 5875, 5880, 5885,
-    5890, 5895, 5900, 5905, 5910, 5915, 5920, 5925, 5930, 5935, 5940, 5945,
-    5950, 5955, 5960, 5965,
-    5970, 5975, 5980, 5985, 5990, 5995, 6000, 6005, 6010, 6015, 6020, 6025,
-    6030, 6035, 6040, 6045,
-    6050, 6055, 6060, 6065, 6070, 6075, 6080, 6085, 6090, 6095, 6100
-  };
-
-  return (channel > 0 && channel <= 221) ? frequencies[channel] : -1;
-}
-
-/**
- * Return the channel from the frequency (in Mhz)
- */
-int
-getChannelFromFrequency (int frequency)
-{
-  if (frequency >= 2412 && frequency <= 2472)
-    return (frequency - 2407) / 5;
-  else if (frequency == 2484)
-    return 14;
-  else if (frequency >= 5000 && frequency <= 6100)
-    return (frequency - 5000) / 5;
-  else
-    return -1;
-}
diff --git a/src/transport/wlan/helper_common.h b/src/transport/wlan/helper_common.h
index 3c33887d1..9d53176c6 100644
--- a/src/transport/wlan/helper_common.h
+++ b/src/transport/wlan/helper_common.h
@@ -9,10 +9,16 @@
 #define HELPER_COMMON_H_
 
 int
-getFrequencyFromChannel (int channel);
-int
-getChannelFromFrequency (int frequency);
-int
 send_mac_to_plugin (char *buffer, uint8_t * mac);
 
+
+#define MAXLINE 4096
+
+struct sendbuf
+{
+  unsigned int pos;
+  unsigned int size;
+  char buf[MAXLINE * 2];
+};
+
 #endif /* HELPER_COMMON_H_ */
diff --git a/src/transport/wlan/loopback_helper.h b/src/transport/wlan/loopback_helper.h
index 81cc66f22..5da3d834e 100644
--- a/src/transport/wlan/loopback_helper.h
+++ b/src/transport/wlan/loopback_helper.h
@@ -17,4 +17,10 @@
 int
 testmode (int argc, char *argv[]);
 
+
+#define FIFO_FILE1       "/tmp/test-transport/api-wlan-p1/WLAN_FIFO_in"
+#define FIFO_FILE2       "/tmp/test-transport/api-wlan-p1/WLAN_FIFO_out"
+
+extern int closeprog;
+
 #endif /* LOOPBACK_HELPER_H_ */