Merge branch 'Development'

Author: rubenmunilla

README.md

@@ -28,7 +28,7 @@ to generate the appropriate Odin agent click file.
 
 This is an example of how to use the python command:
 
-    $ python agent-click-file-gen.py 4 50  14:CC:20:AC:72:91 192.168.1.129 2819 /sys/kernel/debug/ieee80211/phy0/ath9k/bssid_extra odin-unizar 192.168.1.7 0 11 12 25 0
+    $ python agent-click-file-gen.py 4 50  14:CC:20:AC:72:91 192.168.1.129 2819 /sys/kernel/debug/ieee80211/phy0/ath9k/bssid_extra odin-unizar 192.168.1.7 0 11 12 25 0 1 100 10 5 100 0 FF:FF:FF:FF:FF:FF
 
 where the parameters have the next meaning:
 
@@ -56,4 +56,18 @@ where the parameters have the next meaning:
 
 `25`            the Tx power of the AP is 25 dBm (obtained with `$iw dev mon0 info`)
 
-`0              no hidden mode: the AP will respond to all active scanning requests, even if they have no SSID name
+`0`             no hidden mode: the AP will respond to all active scanning requests, even if they have no SSID name
+
+`1`				multichannel agents: 0 if all the APs are in the same channel, 1 if not
+
+`100`			default beacon interval: Time between beacons (in milliseconds)
+
+`10`			burst beacon interval: Time between beacons when a burst of CSAs is sent after a handoff (in milliseconds)
+
+`5`				burst: number of beacons in burst after add lvap or channel change
+
+`100`			measurement beacon interval: Time between measurement beacons (in milliseconds). Used for measuring the distance in dBs between APs
+
+`0`				capture mode: if enabled, two files will be generated, one for each interface, storing radiotap statistics
+
+`FF:FF:FF:FF:FF:FF`		capture mac: the MAC of the wireless interface in STA that will be monitorized. For capture all traffic: FF:FF:FF:FF:FF:FF

agent-click-file-gen.py

@@ -13,7 +13,7 @@
 
 import sys
 
-if (len(sys.argv) != 18):
+if (len(sys.argv) != 21):
     print 'Usage:'
     print ''
     print '%s <AP_CHANNEL> <QUEUE_SIZE> <MAC_ADDR_AP> <ODIN_MASTER_IP> <ODIN_MASTER_PORT> <DEBUGFS_FILE> <SSIDAGENT> <ODIN_AGENT_IP> <DEBUG_CLICK> <DEBUG_ODIN> <TX_RATE> <TX_POWER> <HIDDEN> <MULTICHANNEL_AGENTS> <DEFAULT_BEACON_INTERVAL> <BURST_BEACON_INTERVAL> <MEASUREMENT_BEACON_INTERVAL>' %(sys.argv[0])
@@ -39,10 +39,15 @@
     print '                     If MULTICHANNEL_AGENTS is 0, it means that all the APs are in the same channel'
     print 'DEFAULT_BEACON_INTERVAL: Time between beacons (in milliseconds). Recommended values: 20-100'
     print 'BURST_BEACON_INTERVAL: Time between beacons when a burst of CSAs is sent after a handoff (in milliseconds). Recommended values: 5-10'
+    print 'BURST: Number of beacons to send after add_lvap and channel_assigment. Recommended values: 5-40'
     print 'MEASUREMENT_BEACON_INTERVAL: Time between measurement beacons (in milliseconds). Used for measuring the distance in dBs between APs. Recommended values: 20-100'
+    print 'CAPTURE_MODE: If CAPTURE_MODE is 1, two files will be generated, one for each interface, storing radiotap statistics'
+    print '              If CAPTURE_MODE is 0, no statistic is storaged'
+    print 'MAC_CAPTURE: the MAC of the wireless interface in STA that will be monitorized. e.g. 60:E3:27:4F:C7:AA'
+    print '              For capture all traffic: FF:FF:FF:FF:FF:FF'
     print ''
     print 'Example:'
-    print '$ python %s 9 50 60:E3:27:4F:C7:E1 192.168.1.129 2819 /sys/kernel/debug/ieee80211/phy0/ath9k/bssid_extra wi5-demo 192.168.1.9 0 01 108 25 0 1 100 10 100 > agent.cli' %(sys.argv[0])
+    print '$ python %s 9 50 60:E3:27:4F:C7:E1 192.168.1.129 2819 /sys/kernel/debug/ieee80211/phy0/ath9k/bssid_extra wi5-demo 192.168.1.9 0 01 108 25 0 1 100 10 100 0 FF:FF:FF:FF:FF:FF > agent.cli' %(sys.argv[0])
     print ''
     print 'and then run the .cli file you have generated'
     print 'click$ ./bin/click agent.cli'
@@ -66,7 +71,10 @@
 MULTICHANNEL_AGENTS = int(sys.argv[14])
 DEFAULT_BEACON_INTERVAL = int(sys.argv[15])
 BURST_BEACON_INTERVAL = int(sys.argv[16])
-MEASUREMENT_BEACON_INTERVAL = int(sys.argv[17])
+BURST = int(sys.argv[17])
+MEASUREMENT_BEACON_INTERVAL = int(sys.argv[18])
+CAPTURE_MODE = int(sys.argv[19])
+MAC_CAPTURE = sys.argv[20]
 
 # Set the value of some constants
 NETWORK_INTERFACE_NAMES = "mon"		 # beginning of the network interface names in monitor mode. e.g. mon
@@ -92,8 +100,8 @@
 
 print '''
 // call OdinAgent::configure to create and configure an Odin agent:
-odinagent::OdinAgent(HWADDR %s, RT rates, CHANNEL %s, DEFAULT_GW %s, DEBUGFS %s, SSIDAGENT %s, DEBUG_ODIN %s, TX_RATE %s, TX_POWER %s, HIDDEN %s, MULTICHANNEL_AGENTS %s, DEFAULT_BEACON_INTERVAL %s, BURST_BEACON_INTERVAL %s, MEASUREMENT_BEACON_INTERVAL %s)
-''' % (AP_UNIQUE_BSSID, AP_CHANNEL, DEFAULT_GW, DEBUGFS_FILE, SSIDAGENT, DEBUG_ODIN, TX_RATE, TX_POWER, HIDDEN, MULTICHANNEL_AGENTS, DEFAULT_BEACON_INTERVAL, BURST_BEACON_INTERVAL, MEASUREMENT_BEACON_INTERVAL)
+odinagent::OdinAgent(HWADDR %s, RT rates, CHANNEL %s, DEFAULT_GW %s, DEBUGFS %s, SSIDAGENT %s, DEBUG_ODIN %s, TX_RATE %s, TX_POWER %s, HIDDEN %s, MULTICHANNEL_AGENTS %s, DEFAULT_BEACON_INTERVAL %s, BURST_BEACON_INTERVAL %s, BURST %s, MEASUREMENT_BEACON_INTERVAL %s, CAPTURE_MODE %s, MAC_CAPTURE %s)
+''' % (AP_UNIQUE_BSSID, AP_CHANNEL, DEFAULT_GW, DEBUGFS_FILE, SSIDAGENT, DEBUG_ODIN, TX_RATE, TX_POWER, HIDDEN, MULTICHANNEL_AGENTS, DEFAULT_BEACON_INTERVAL, BURST_BEACON_INTERVAL,BURST, MEASUREMENT_BEACON_INTERVAL, CAPTURE_MODE, MAC_CAPTURE)
 
 print '''// send a ping to odinsocket every 2 seconds
 TimedSource(2, "ping\n")->  odinsocket::Socket(UDP, %s, %s, CLIENT true)
@@ -265,4 +273,4 @@
 if (DEBUG_CLICK > 0):
     print '''  -> Print("[Click] ARP Fast path fail")''' 
 
-print '''  -> ToHost(%s)''' % ( TAP_INTERFACE_NAME )
+print '''  -> ToHost(%s)''' % ( TAP_INTERFACE_NAME )