commit 80bb337cf08c8868d698ca514f59721bb971161c
author Paul Stewart <pstew@chromium.org> Wed Jan 22 15:06:08 2014 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Jan 28 18:13:32 2014 +0000
tree 2ba7cbc3ff81b02ada82d5f7d09479eb4bdd0667
parent f521d8961c62d9656720139ad94e21f2f8a04344

Fix control interface for hostapd instances

Fix deauth_client to glean the control interface out of the
config dictionary for the instance instead of expecting it to
be at the top-level instance.  While here, generate a
per-interface control interface file

BUG=None
TEST=New test which calls deauth_client

Change-Id: I5e5e5258330d8ac373eb1a6d615474a77441f9b7
Reviewed-on: https://chromium-review.googlesource.com/183544
Reviewed-by: Christopher Wiley <wiley@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>
Commit-Queue: Paul Stewart <pstew@chromium.org>

server/site_linux_router.py

diff --git a/server/site_linux_router.py b/server/site_linux_router.py
index 669d178..ae89ecc 100644
--- a/server/site_linux_router.py
+++ b/server/site_linux_router.py
@@ -39,6 +39,7 @@
     HOSTAPD_CONF_FILE_PATTERN = '/tmp/hostapd-test-%s.conf'
     HOSTAPD_LOG_FILE_PATTERN = '/tmp/hostapd-test-%s.log'
     HOSTAPD_PID_FILE_PATTERN = '/tmp/hostapd-test-%s.pid'
+    HOSTAPD_CONTROL_INTERFACE_PATTERN = '/tmp/hostapd-test-%s.ctrl'
     HOSTAPD_DRIVER_NAME = 'nl80211'
 
     STATION_CONF_FILE_PATTERN = '/tmp/wpa-supplicant-test-%s.conf'
@@ -137,7 +138,9 @@
         conf_file = self.HOSTAPD_CONF_FILE_PATTERN % interface
         log_file = self.HOSTAPD_LOG_FILE_PATTERN % interface
         pid_file = self.HOSTAPD_PID_FILE_PATTERN % interface
+        control_interface = self.HOSTAPD_CONTROL_INTERFACE_PATTERN % interface
         hostapd_conf_dict['interface'] = interface
+        hostapd_conf_dict['ctrl_interface'] = control_interface
 
         # Generate hostapd.conf.
         self.router.run("cat <<EOF >%s\n%s\nEOF\n" %
@@ -237,7 +240,6 @@
     def __get_default_hostap_config(self):
         """@return dict of default options for hostapd."""
         return {'hw_mode': 'g',
-                'ctrl_interface': '/tmp/hostapd-test.control',
                 'logger_syslog': '-1',
                 'logger_syslog_level': '0',
                 # default RTS and frag threshold to ``off''
@@ -620,10 +622,9 @@
                deauthenticated.
 
         """
+        control_if = self.hostapd_instances[-1]['config_dict']['ctrl_interface']
         self.router.run('%s -p%s deauthenticate %s' %
-                        (self.cmd_hostapd_cli,
-                         self.hostapd_instances[-1]['ctrl_interface'],
-                         client_mac))
+                        (self.cmd_hostapd_cli, control_if, client_mac))
 
 
     def send_management_frame(self, frame_type, instance=0):