More work on wifi tests

server/site_linux_router.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import re
 
 def isLinuxRouter(router):
     router_uname = router.run('uname').stdout
     return re.search('Linux', router_uname)
 
@@ skipping 68 matching lines @@
         # Remove all wifi devices.
         output = self.router.run("%s dev" % self.cmd_iw).stdout
         test = re.compile("[\s]*Interface (.*)")
         for line in output.splitlines():
             m = test.match(line)
             if m:
                 device = m.group(1)
                 self.router.run("%s link set %s down" % (self.cmd_ip, device))
                 self.router.run("%s dev %s del" % (self.cmd_iw, device))
 
+        # Place us in the US by default
+        self.router.run("%s reg set US" % self.cmd_iw)
 
     def create(self, params):
         """ Create a wifi device of the specified type """
         #
         # AP mode is handled entirely by hostapd so we only
         # have to setup others (mapping the bsd type to what
         # iw wants)
         #
         # map from bsd types to iw types
         if params['type'] == "ap" or params['type'] == "hostap":
@@ skipping 52 matching lines @@
                             conf['channel'] = (freq - 2407) / 5
                         # Channel 14 is an exception
                         elif freq == 2484:
                             conf['channel'] = 14
                     # 5GHz
                     else:
                         # Make sure hw_mode is set
                         conf['hw_mode'] = 'a'
                         # Freq = 5 * chan + 4000
                         if freq >= 4915 and freq <= 4980:
-                            conf['channel'] = 183 + (freq - 4915) / 5
+                            conf['channel'] = (freq - 4000) / 5
                         # Freq = 5 * chan + 5000
                         elif freq >= 5035 and freq <= 5825:
                             conf['channel'] = (freq - 5000) / 5
 
                 elif k == 'country':
                     conf['country_code'] = v
                 elif k == 'dotd':
                     conf['ieee80211d'] = 1
                 elif k == '-dotd':
                     conf['ieee80211d'] = 0
                 elif k == 'mode':
                     if v == '11a':
                         conf['hw_mode'] = 'a'
                     elif v == '11g':
                         conf['hw_mode'] = 'g'
                     elif v == '11b':
                         conf['hw_mode'] = 'b'
                     elif v == '11n':
                         conf['ieee80211n'] = 1
                 elif k == 'bintval':
                     conf['beacon_int'] = v
                 elif k == 'dtimperiod':
                     conf['dtim_period'] = v
                 elif k == 'rtsthreshold':
                     conf['rts_threshold'] = v
                 elif k == 'fragthreshold':
                     conf['fragm_threshold'] = v
                 elif k == 'shortpreamble':
                     conf['preamble'] = 1
-                elif k == 'protmode':
-                    pass        # TODO(sleffler) need hostapd support
                 elif k == 'authmode':
                     if v == "open":
                         conf['auth_algs'] = 1
                     elif v == "shared":
                         conf['auth_algs'] = 2
                 elif k == 'hidessid':
                     conf['ignore_broadcast_ssid'] = 1
                 elif k == 'wme':
                     conf['wmm_enabled'] = 1
                 elif k == '-wme':
                     conf['wmm_enabled'] = 0
                 elif k == 'deftxkey':
                     conf['wep_default_key'] = v
                 elif k == 'ht20':
                     htcaps.add('')  # NB: ensure 802.11n setup below
                     conf['wmm_enabled'] = 1
                 elif k == 'ht40':
                     htcaps.add('[HT40-]')
                     htcaps.add('[HT40+]')
                     conf['wmm_enabled'] = 1
                 elif k == 'shortgi':
                     htcaps.add('[SHORT-GI-20]')
                     htcaps.add('[SHORT-GI-40]')
                 elif k == 'pureg':
                     pass        # TODO(sleffler) need hostapd support
                 elif k == 'puren':
                     pass        # TODO(sleffler) need hostapd support
+                elif k == 'protmode':
+                    pass        # TODO(sleffler) need hostapd support
                 elif k == 'ht':
                     htcaps.add('')  # NB: ensure 802.11n setup below
                 elif k == 'htprotmode':
                     pass        # TODO(sleffler) need hostapd support
                 elif k == 'rifs':
                     pass        # TODO(sleffler) need hostapd support
                 elif k == 'wepmode':
                     pass        # NB: meaningless for hostapd; ignore
+                elif k == '-ampdu':
+                    pass        # TODO(sleffler) need hostapd support
                 else:
                     conf[k] = v
 
             # Aggregate ht_capab.
             if htcaps:
                 conf['ieee80211n'] = 1
                 conf['ht_capab'] = ''.join(htcaps)
 
             # Generate hostapd.conf.
             self.router.run("cat <<EOF >%s\n%s\nEOF\n" %
@@ skipping 30 matching lines @@
         self.router.run("pkill hostapd >/dev/null 2>&1", ignore_status=True)
 #        self.router.run("rm -f %s" % self.hostapd['file'])
 
         # Tear down the bridge.
         self.router.run("%s link set %s down" % (self.cmd_ip, self.bridgeif),
             ignore_status=True)
         self.router.run("%s delbr %s" % (self.cmd_brctl, self.bridgeif),
             ignore_status=True)
 
         self.hostapd['configured'] = False