1 files changed, 48 insertions, 34 deletions
diff --git a/src/transport/wlan/helper_common.c b/src/transport/wlan/helper_common.c
index 24782ed11..d4b1204f6 100644
--- a/src/transport/wlan/helper_common.c
+++ b/src/transport/wlan/helper_common.c
@@ -34,17 +34,17 @@
 * @return number of bytes written
 */
 int
-send_mac_to_plugin(char * buffer, uint8_t * mac)
+send_mac_to_plugin (char *buffer, uint8_t * mac)
 {
  struct Wlan_Helper_Control_Message macmsg;
-  memcpy(macmsg.mac.mac, mac, sizeof(struct MacAddress));
+  memcpy (macmsg.mac.mac, mac, sizeof (struct MacAddress));
-  macmsg.hdr.size = htons(sizeof(struct Wlan_Helper_Control_Message));
+  macmsg.hdr.size = htons (sizeof (struct Wlan_Helper_Control_Message));
-  macmsg.hdr.type = htons(GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL);
+  macmsg.hdr.type = htons (GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL);
-  memcpy(buffer, &macmsg, sizeof(struct Wlan_Helper_Control_Message));
+  memcpy (buffer, &macmsg, sizeof (struct Wlan_Helper_Control_Message));
-  return sizeof(struct Wlan_Helper_Control_Message);
+  return sizeof (struct Wlan_Helper_Control_Message);
 }
 /*
@@ -70,40 +70,54 @@ send_mac_to_plugin(char * buffer, uint8_t * mac)
 /**
 * Return the frequency in Mhz from a channel number
 */
-int getFrequencyFromChannel(int channel)
+int
+getFrequencyFromChannel (int channel)
 {
-        static int frequencies[] = {
+  static int frequencies[] = {
-                -1, // No channel 0
+    -1,                         // No channel 0
-                2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447, 2452, 2457, 2462, 2467, 2472, 2484,
+    2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447, 2452, 2457, 2462, 2467,
-                -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)
+    2472, 2484,
-                5170, 5175, 5180, 5185, 5190, 5195, 5200, 5205, 5210, 5215, 5220, 5225, 5230, 5235, 5240, 5245,
+    -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)
-                5250, 5255, 5260, 5265, 5270, 5275, 5280, 5285, 5290, 5295, 5300, 5305, 5310, 5315, 5320, 5325,
+    5170, 5175, 5180, 5185, 5190, 5195, 5200, 5205, 5210, 5215, 5220, 5225,
-                5330, 5335, 5340, 5345, 5350, 5355, 5360, 5365, 5370, 5375, 5380, 5385, 5390, 5395, 5400, 5405,
+    5230, 5235, 5240, 5245,
-                5410, 5415, 5420, 5425, 5430, 5435, 5440, 5445, 5450, 5455, 5460, 5465, 5470, 5475, 5480, 5485,
+    5250, 5255, 5260, 5265, 5270, 5275, 5280, 5285, 5290, 5295, 5300, 5305,
-                5490, 5495, 5500, 5505, 5510, 5515, 5520, 5525, 5530, 5535, 5540, 5545, 5550, 5555, 5560, 5565,
+    5310, 5315, 5320, 5325,
-                5570, 5575, 5580, 5585, 5590, 5595, 5600, 5605, 5610, 5615, 5620, 5625, 5630, 5635, 5640, 5645,
+    5330, 5335, 5340, 5345, 5350, 5355, 5360, 5365, 5370, 5375, 5380, 5385,
-                5650, 5655, 5660, 5665, 5670, 5675, 5680, 5685, 5690, 5695, 5700, 5705, 5710, 5715, 5720, 5725,
+    5390, 5395, 5400, 5405,
-                5730, 5735, 5740, 5745, 5750, 5755, 5760, 5765, 5770, 5775, 5780, 5785, 5790, 5795, 5800, 5805,
+    5410, 5415, 5420, 5425, 5430, 5435, 5440, 5445, 5450, 5455, 5460, 5465,
-                5810, 5815, 5820, 5825, 5830, 5835, 5840, 5845, 5850, 5855, 5860, 5865, 5870, 5875, 5880, 5885,
+    5470, 5475, 5480, 5485,
-                5890, 5895, 5900, 5905, 5910, 5915, 5920, 5925, 5930, 5935, 5940, 5945, 5950, 5955, 5960, 5965,
+    5490, 5495, 5500, 5505, 5510, 5515, 5520, 5525, 5530, 5535, 5540, 5545,
-                5970, 5975, 5980, 5985, 5990, 5995, 6000, 6005, 6010, 6015, 6020, 6025, 6030, 6035, 6040, 6045,
+    5550, 5555, 5560, 5565,
-                6050, 6055, 6060, 6065, 6070, 6075, 6080, 6085, 6090, 6095, 6100
+    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 (channel > 0 && channel <= 221) ? frequencies[channel] : -1;
 }
 /**
 * Return the channel from the frequency (in Mhz)
 */
-int getChannelFromFrequency(int frequency)
+int
+getChannelFromFrequency (int frequency)
 {
-        if (frequency >= 2412 && frequency <= 2472)
+  if (frequency >= 2412 && frequency <= 2472)
-                return (frequency - 2407) / 5;
+    return (frequency - 2407) / 5;
-        else if (frequency == 2484)
+  else if (frequency == 2484)
-                return 14;
+    return 14;
-        else if (frequency >= 5000 && frequency <= 6100)
+  else if (frequency >= 5000 && frequency <= 6100)
-                return (frequency - 5000) / 5;
+    return (frequency - 5000) / 5;
-        else
+  else
-                return -1;
+    return -1;
 }

diff --git a/src/transport/wlan/helper_common.c b/src/transport/wlan/helper_common.c index 24782ed11..d4b1204f6 100644 --- a/src/transport/wlan/helper_common.c +++ b/src/transport/wlan/helper_common.c
@@ -34,17 +34,17 @@
34	* @return number of bytes written	34	* @return number of bytes written
35	*/	35	*/
36	int	36	int
37	send_mac_to_plugin(char * buffer, uint8_t * mac)	37	send_mac_to_plugin (char buffer, uint8_t mac)
38	{	38	{
39		39
40	struct Wlan_Helper_Control_Message macmsg;	40	struct Wlan_Helper_Control_Message macmsg;
41		41
42	memcpy(macmsg.mac.mac, mac, sizeof(struct MacAddress));	42	memcpy (macmsg.mac.mac, mac, sizeof (struct MacAddress));
43	macmsg.hdr.size = htons(sizeof(struct Wlan_Helper_Control_Message));	43	macmsg.hdr.size = htons (sizeof (struct Wlan_Helper_Control_Message));
44	macmsg.hdr.type = htons(GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL);	44	macmsg.hdr.type = htons (GNUNET_MESSAGE_TYPE_WLAN_HELPER_CONTROL);
45		45
46	memcpy(buffer, &macmsg, sizeof(struct Wlan_Helper_Control_Message));	46	memcpy (buffer, &macmsg, sizeof (struct Wlan_Helper_Control_Message));
47	return sizeof(struct Wlan_Helper_Control_Message);	47	return sizeof (struct Wlan_Helper_Control_Message);
48	}	48	}
49		49
50	/*	50	/*
@@ -70,40 +70,54 @@ send_mac_to_plugin(char * buffer, uint8_t * mac)
70	/**	70	/**
71	* Return the frequency in Mhz from a channel number	71	* Return the frequency in Mhz from a channel number
72	*/	72	*/
73	int getFrequencyFromChannel(int channel)	73	int
		74	getFrequencyFromChannel (int channel)
74	{	75	{
75	static int frequencies[] = {	76	static int frequencies[] = {
76	-1, // No channel 0	77	-1, // No channel 0
77	2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447, 2452, 2457, 2462, 2467, 2472, 2484,	78	2412, 2417, 2422, 2427, 2432, 2437, 2442, 2447, 2452, 2457, 2462, 2467,
78	-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)	79	2472, 2484,
79	5170, 5175, 5180, 5185, 5190, 5195, 5200, 5205, 5210, 5215, 5220, 5225, 5230, 5235, 5240, 5245,	80	-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)
80	5250, 5255, 5260, 5265, 5270, 5275, 5280, 5285, 5290, 5295, 5300, 5305, 5310, 5315, 5320, 5325,	81	5170, 5175, 5180, 5185, 5190, 5195, 5200, 5205, 5210, 5215, 5220, 5225,
81	5330, 5335, 5340, 5345, 5350, 5355, 5360, 5365, 5370, 5375, 5380, 5385, 5390, 5395, 5400, 5405,	82	5230, 5235, 5240, 5245,
82	5410, 5415, 5420, 5425, 5430, 5435, 5440, 5445, 5450, 5455, 5460, 5465, 5470, 5475, 5480, 5485,	83	5250, 5255, 5260, 5265, 5270, 5275, 5280, 5285, 5290, 5295, 5300, 5305,
83	5490, 5495, 5500, 5505, 5510, 5515, 5520, 5525, 5530, 5535, 5540, 5545, 5550, 5555, 5560, 5565,	84	5310, 5315, 5320, 5325,
84	5570, 5575, 5580, 5585, 5590, 5595, 5600, 5605, 5610, 5615, 5620, 5625, 5630, 5635, 5640, 5645,	85	5330, 5335, 5340, 5345, 5350, 5355, 5360, 5365, 5370, 5375, 5380, 5385,
85	5650, 5655, 5660, 5665, 5670, 5675, 5680, 5685, 5690, 5695, 5700, 5705, 5710, 5715, 5720, 5725,	86	5390, 5395, 5400, 5405,
86	5730, 5735, 5740, 5745, 5750, 5755, 5760, 5765, 5770, 5775, 5780, 5785, 5790, 5795, 5800, 5805,	87	5410, 5415, 5420, 5425, 5430, 5435, 5440, 5445, 5450, 5455, 5460, 5465,
87	5810, 5815, 5820, 5825, 5830, 5835, 5840, 5845, 5850, 5855, 5860, 5865, 5870, 5875, 5880, 5885,	88	5470, 5475, 5480, 5485,
88	5890, 5895, 5900, 5905, 5910, 5915, 5920, 5925, 5930, 5935, 5940, 5945, 5950, 5955, 5960, 5965,	89	5490, 5495, 5500, 5505, 5510, 5515, 5520, 5525, 5530, 5535, 5540, 5545,
89	5970, 5975, 5980, 5985, 5990, 5995, 6000, 6005, 6010, 6015, 6020, 6025, 6030, 6035, 6040, 6045,	90	5550, 5555, 5560, 5565,
90	6050, 6055, 6060, 6065, 6070, 6075, 6080, 6085, 6090, 6095, 6100	91	5570, 5575, 5580, 5585, 5590, 5595, 5600, 5605, 5610, 5615, 5620, 5625,
91	};	92	5630, 5635, 5640, 5645,
		93	5650, 5655, 5660, 5665, 5670, 5675, 5680, 5685, 5690, 5695, 5700, 5705,
		94	5710, 5715, 5720, 5725,
		95	5730, 5735, 5740, 5745, 5750, 5755, 5760, 5765, 5770, 5775, 5780, 5785,
		96	5790, 5795, 5800, 5805,
		97	5810, 5815, 5820, 5825, 5830, 5835, 5840, 5845, 5850, 5855, 5860, 5865,
		98	5870, 5875, 5880, 5885,
		99	5890, 5895, 5900, 5905, 5910, 5915, 5920, 5925, 5930, 5935, 5940, 5945,
		100	5950, 5955, 5960, 5965,
		101	5970, 5975, 5980, 5985, 5990, 5995, 6000, 6005, 6010, 6015, 6020, 6025,
		102	6030, 6035, 6040, 6045,
		103	6050, 6055, 6060, 6065, 6070, 6075, 6080, 6085, 6090, 6095, 6100
		104	};
92		105
93	return (channel > 0 && channel <= 221) ? frequencies[channel] : -1;	106	return (channel > 0 && channel <= 221) ? frequencies[channel] : -1;
94	}	107	}
95		108
96	/**	109	/**
97	* Return the channel from the frequency (in Mhz)	110	* Return the channel from the frequency (in Mhz)
98	*/	111	*/
99	int getChannelFromFrequency(int frequency)	112	int
		113	getChannelFromFrequency (int frequency)
100	{	114	{
101	if (frequency >= 2412 && frequency <= 2472)	115	if (frequency >= 2412 && frequency <= 2472)
102	return (frequency - 2407) / 5;	116	return (frequency - 2407) / 5;
103	else if (frequency == 2484)	117	else if (frequency == 2484)
104	return 14;	118	return 14;
105	else if (frequency >= 5000 && frequency <= 6100)	119	else if (frequency >= 5000 && frequency <= 6100)
106	return (frequency - 5000) / 5;	120	return (frequency - 5000) / 5;
107	else	121	else
108	return -1;	122	return -1;
109	}	123	}