commit 0f64b840ff4deab3cd1c7f1bfd57b6d2d1513d37
author Christopher Wiley <wiley@chromium.org> Wed Apr 30 15:43:50 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu May 22 02:24:57 2014 +0000
tree 76b919f026c498bb57b782c04b3d687969458896
parent ef60bc08ecccfe76c239c06b6db1a95425ed7886

Make site_linux_router work with hostapd 2.1

The newer version of hostapd does not include command line flags to
write out a pid file.

BUG=chromium:365816
TEST=network_WiFi_SimpleConnect.wifi_checkWPA_TKIP passes with the older
hostapd we use today, as well as hostapd 2.1.

Change-Id: Ifdad0199d3c3b7d2451909a102c9a200041a6e3e
Reviewed-on: https://chromium-review.googlesource.com/200260
Tested-by: Christopher Wiley <wiley@chromium.org>
Reviewed-by: Peter Qiu <zqiu@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Queue: Christopher Wiley <wiley@chromium.org>

server/site_linux_router.py

diff --git a/server/site_linux_router.py b/server/site_linux_router.py
index 7cdf371..23935f9 100644
--- a/server/site_linux_router.py
+++ b/server/site_linux_router.py
@@ -39,7 +39,6 @@
 
     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'
 
@@ -152,7 +151,6 @@
 
         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 = configuration.generate_dict(
                 interface, control_interface,
@@ -167,22 +165,19 @@
         # Run hostapd.
         logging.info("Starting hostapd...")
         self.router.run('rm %s' % log_file, ignore_status=True)
-        self.router.run('rm %s' % pid_file, ignore_status=True)
         self.router.run('stop wpasupplicant', ignore_status=True)
-        start_command = '%s -dd -B -t -f %s -P %s %s' % (
-                self.cmd_hostapd, log_file, pid_file, conf_file)
-        self.router.run(start_command)
+        start_command = '%s -dd -t %s &> %s & echo $!' % (
+                self.cmd_hostapd, conf_file, log_file)
+        pid = int(self.router.run(start_command).stdout.strip())
         self.hostapd_instances.append({
             'ssid': hostapd_conf_dict['ssid'],
             'conf_file': conf_file,
             'log_file': log_file,
             'interface': interface,
-            'pid_file': pid_file,
             'config_dict': hostapd_conf_dict.copy()
         })
 
         # Wait for confirmation that the router came up.
-        pid = int(self.router.run('cat %s' % pid_file).stdout)
         logging.info('Waiting for hostapd to startup.')
         start_time = time.time()
         while time.time() - start_time < self.STARTUP_TIMEOUT_SECONDS: