jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: Add UDP ctrl_iface support to hostapd.py

Browse source 
Allow use of a remote host using wpaspy.Ctrl with UDP ctrl_iface
support.

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
This commit is contained in:
Janusz Dziedzic 2016-03-04 10:20:35 +01:00 committed by Jouni Malinen
parent 0fd4792b48
commit cb73f7e84d
1 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
tests/hwsim/hostapd.py
View file

@ -19,9 +19,15 @@ def mac2tuple(mac):
return struct.unpack('6B', binascii.unhexlify(mac.replace(':',''))) return struct.unpack('6B', binascii.unhexlify(mac.replace(':','')))
class HostapdGlobal: class HostapdGlobal:
def __init__(self): def __init__(self, hostname=None, port=8878):
self.ctrl = wpaspy.Ctrl(hapd_global) self.hostname = hostname
self.mon = wpaspy.Ctrl(hapd_global) self.port = port
if hostname is None:
self.ctrl = wpaspy.Ctrl(hapd_global)
self.mon = wpaspy.Ctrl(hapd_global)
else:
self.ctrl = wpaspy.Ctrl(hostname, port)
self.mon = wpaspy.Ctrl(hostname, port)
self.mon.attach() self.mon.attach()
def request(self, cmd): def request(self, cmd):
@ -77,10 +83,14 @@ class HostapdGlobal:
class Hostapd: class Hostapd:
def __init__(self, ifname, bssidx=0): def __init__(self, ifname, bssidx=0, hostname=None, port=8877):
self.ifname = ifname self.ifname = ifname
self.ctrl = wpaspy.Ctrl(os.path.join(hapd_ctrl, ifname)) if hostname is None:
self.mon = wpaspy.Ctrl(os.path.join(hapd_ctrl, ifname)) self.ctrl = wpaspy.Ctrl(os.path.join(hapd_ctrl, ifname))
self.mon = wpaspy.Ctrl(os.path.join(hapd_ctrl, ifname))
else:
self.ctrl = wpaspy.Ctrl(hostname, port)
self.mon = wpaspy.Ctrl(hostname, port)
self.mon.attach() self.mon.attach()
self.bssid = None self.bssid = None
self.bssidx = bssidx self.bssidx = bssidx
@ -275,12 +285,13 @@ class Hostapd:
vals[name_val[0]] = name_val[1] vals[name_val[0]] = name_val[1]
return vals return vals
def add_ap(ifname, params, wait_enabled=True, no_enable=False, timeout=30): def add_ap(ifname, params, wait_enabled=True, no_enable=False, timeout=30,
hostname=None, port=8878):
logger.info("Starting AP " + ifname) logger.info("Starting AP " + ifname)
hapd_global = HostapdGlobal() hapd_global = HostapdGlobal(hostname=hostname, port=port)
hapd_global.remove(ifname) hapd_global.remove(ifname)
hapd_global.add(ifname) hapd_global.add(ifname)
hapd = Hostapd(ifname) hapd = Hostapd(ifname, hostname=hostname)
if not hapd.ping(): if not hapd.ping():
raise Exception("Could not ping hostapd") raise Exception("Could not ping hostapd")
hapd.set_defaults() hapd.set_defaults()
@ -310,25 +321,26 @@ def add_ap(ifname, params, wait_enabled=True, no_enable=False, timeout=30):
raise Exception("AP startup failed") raise Exception("AP startup failed")
return hapd return hapd
def add_bss(phy, ifname, confname, ignore_error=False): def add_bss(phy, ifname, confname, ignore_error=False, hostname=None,
port=8878):
logger.info("Starting BSS phy=" + phy + " ifname=" + ifname) logger.info("Starting BSS phy=" + phy + " ifname=" + ifname)
hapd_global = HostapdGlobal() hapd_global = HostapdGlobal(hostname=hostname, port=port)
hapd_global.add_bss(phy, confname, ignore_error) hapd_global.add_bss(phy, confname, ignore_error)
hapd = Hostapd(ifname) hapd = Hostapd(ifname, hostname=hostname)
if not hapd.ping(): if not hapd.ping():
raise Exception("Could not ping hostapd") raise Exception("Could not ping hostapd")
def add_iface(ifname, confname): def add_iface(ifname, confname, hostname=None, port=8878):
logger.info("Starting interface " + ifname) logger.info("Starting interface " + ifname)
hapd_global = HostapdGlobal() hapd_global = HostapdGlobal(hostname=hostname, port=port)
hapd_global.add_iface(ifname, confname) hapd_global.add_iface(ifname, confname)
hapd = Hostapd(ifname) hapd = Hostapd(ifname, hostname=hostname)
if not hapd.ping(): if not hapd.ping():
raise Exception("Could not ping hostapd") raise Exception("Could not ping hostapd")
def remove_bss(ifname): def remove_bss(ifname, hostname=None, port=8878):
logger.info("Removing BSS " + ifname) logger.info("Removing BSS " + ifname)
hapd_global = HostapdGlobal() hapd_global = HostapdGlobal(hostname=hostname, port=port)
hapd_global.remove(ifname) hapd_global.remove(ifname)
def wpa2_params(ssid=None, passphrase=None): def wpa2_params(ssid=None, passphrase=None):