1 files changed, 46 insertions, 28 deletions

diff --git a/src/conf_mode/interfaces-wireless.py b/src/conf_mode/interfaces-wireless.py
index 59fb21125..8132a396c 100755
--- a/src/conf_mode/interfaces-wireless.py
+++ b/src/conf_mode/interfaces-wireless.py
@@ -847,7 +847,7 @@ default_config_data = {
     'sec_wpa_passphrase' : '',
     'sec_wpa_radius' : [],
     'ssid' : '',
-    'type' : 'monitor',
+    'op_mode' : 'monitor',
     'vif': [],
     'vif_remove': [],
     'vrf': ''
@@ -1255,7 +1255,11 @@ def get_config():
 
     # Wireless device type for this interface
     if conf.exists('type'):
-        wifi['type'] = conf.return_value('type')
+        tmp = conf.return_value('type')
+        if tmp == 'access-point':
+            tmp = 'ap'
+
+        wifi['op_mode'] = tmp
 
     # re-set configuration level to parse new nodes
     conf.set_level(cfg_base)
@@ -1287,13 +1291,13 @@ def verify(wifi):
     if wifi['deleted']:
         return None
 
-    if wifi['type'] != 'monitor' and not wifi['ssid']:
+    if wifi['op_mode'] != 'monitor' and not wifi['ssid']:
         raise ConfigError('SSID must be set for {}'.format(wifi['intf']))
 
     if not wifi['phy']:
         raise ConfigError('You must specify physical-device')
 
-    if wifi['type'] == 'access-point':
+    if wifi['op_mode'] == 'ap':
         c = Config()
         if not c.exists('system wifi-regulatory-domain'):
             raise ConfigError('Wireless regulatory domain is mandatory,\n' \
@@ -1328,29 +1332,24 @@ def verify(wifi):
     # use common function to verify VLAN configuration
     verify_vlan_config(wifi)
 
+    conf = Config()
+    # Only one wireless interface per phy can be in station mode
+    base = ['interfaces', 'wireless']
+    for phy in os.listdir('/sys/class/ieee80211'):
+        stations = []
+        for wlan in conf.list_nodes(base):
+            # the following node is mandatory
+            if conf.exists(base + [wlan, 'physical-device', phy]):
+                tmp = conf.return_value(base + [wlan, 'type'])
+                if tmp == 'station':
+                    stations.append(wlan)
+
+        if len(stations) > 1:
+            raise ConfigError('Only one station per wireless physical interface possible!')
+
     return None
 
 def generate(wifi):
-
-    if not wifi['mac']:
-        # http://wiki.stocksy.co.uk/wiki/Multiple_SSIDs_with_hostapd
-        # generate locally administered MAC address from used phy interface
-        with open('/sys/class/ieee80211/{}/addresses'.format(wifi['phy']), 'r') as f:
-            tmp = EUI(f.read().rstrip()).value
-            # mask last nibble from the MAC address
-            tmp &= 0xfffffffffff0
-            # set locally administered bit in MAC address
-            tmp |= 0x020000000000
-            # we now need to add an offset to our MAC address indicating this
-            # subinterfaces index
-            tmp += int(findall(r'\d+', wifi['intf'])[0])
-
-            # convert integer to "real" MAC address representation
-            mac = EUI(hex(tmp).split('x')[-1])
-            # change dialect to use : as delimiter instead of -
-            mac.dialect = mac_unix_expanded
-            wifi['mac'] = str(mac)
-
     pid = 0
     # always stop hostapd service first before reconfiguring it
     pidfile = get_pid('hostapd', wifi['intf'])
@@ -1386,14 +1385,33 @@ def generate(wifi):
 
         return None
 
+    if not wifi['mac']:
+        # http://wiki.stocksy.co.uk/wiki/Multiple_SSIDs_with_hostapd
+        # generate locally administered MAC address from used phy interface
+        with open('/sys/class/ieee80211/{}/addresses'.format(wifi['phy']), 'r') as f:
+            tmp = EUI(f.read().rstrip()).value
+            # mask last nibble from the MAC address
+            tmp &= 0xfffffffffff0
+            # set locally administered bit in MAC address
+            tmp |= 0x020000000000
+            # we now need to add an offset to our MAC address indicating this
+            # subinterfaces index
+            tmp += int(findall(r'\d+', wifi['intf'])[0])
+
+            # convert integer to "real" MAC address representation
+            mac = EUI(hex(tmp).split('x')[-1])
+            # change dialect to use : as delimiter instead of -
+            mac.dialect = mac_unix_expanded
+            wifi['mac'] = str(mac)
+
     # render appropriate new config files depending on access-point or station mode
-    if wifi['type'] == 'access-point':
+    if wifi['op_mode'] == 'ap':
         tmpl = Template(config_hostapd_tmpl)
         config_text = tmpl.render(wifi)
         with open(get_conf_file('hostapd', wifi['intf']), 'w') as f:
             f.write(config_text)
 
-    elif wifi['type'] == 'station':
+    elif wifi['op_mode'] == 'station':
         tmpl = Template(config_wpa_suppl_tmpl)
         config_text = tmpl.render(wifi)
         with open(get_conf_file('wpa_supplicant', wifi['intf']), 'w') as f:
@@ -1497,7 +1515,7 @@ def apply(wifi):
 
     # Physical interface is now configured. Proceed by starting hostapd or
     # wpa_supplicant daemon. When type is monitor we can just skip this.
-    if wifi['type'] == 'access-point':
+    if wifi['op_mode'] == 'ap':
         cmd  = 'start-stop-daemon --start --quiet'
         cmd += ' --exec /usr/sbin/hostapd'
         # now pass arguments to hostapd binary
@@ -1508,7 +1526,7 @@ def apply(wifi):
         # execute assembled command
         subprocess_cmd(cmd)
 
-    elif wifi['type'] == 'station':
+    elif wifi['op_mode'] == 'station':
         cmd  = 'start-stop-daemon --start --quiet'
         cmd += ' --exec /sbin/wpa_supplicant'
         # now pass arguments to hostapd binary