Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 14:49:24 +01:00
Code Releases Activity

auto-t: fix hostapd.ungraceful_restart

Browse Source 
Restarting hostapd from python was actually leaking memory and
causing the hostapd object to stay referenced in python. The
GLib timeout in wait_for_event was the ultimate cause, but this
had no come to light because no tests restarted hostapd then
used wait_for_event.

In addition, any use of wait_for_event after a restart would
cause an exception because the event socket was never re-attached
after hostapd restarted.

Now we properly clean up the timeout in wait_for_event and
re-initialize the hostapd object on restart.
This commit is contained in:
James Prestwood 2020-07-14 11:49:07 -07:00 committed by Denis Kenzior
parent b94bc39827
commit 933be89812
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
autotests/util/hostapd.py
View File

@ -33,7 +33,7 @@ hostapd_map = {ifname: intf for wname, wiphy in wiphy_map.items()
if wiphy.use == 'hostapd'} if wiphy.use == 'hostapd'}
class HostapdCLI: class HostapdCLI:
def __init__(self, interface=None, config=None): def _init_hostapd(self, interface=None, config=None):
global ctrl_count global ctrl_count
if not interface and not config: if not interface and not config:
@ -54,6 +54,7 @@ class HostapdCLI:
self.cmdline = 'hostapd_cli -p"' + self.socket_path + '" -i"' + \ self.cmdline = 'hostapd_cli -p"' + self.socket_path + '" -i"' + \
self.ifname + '"' self.ifname + '"'
if not hasattr(self, '_hostapd_restarted'):
self._hostapd_restarted = False self._hostapd_restarted = False
self.local_ctrl = '/tmp/hostapd_' + str(os.getpid()) + '_' + \ self.local_ctrl = '/tmp/hostapd_' + str(os.getpid()) + '_' + \
@ -67,6 +68,9 @@ class HostapdCLI:
ctrl_count = ctrl_count + 1 ctrl_count = ctrl_count + 1
def __init__(self, interface=None, config=None):
self._init_hostapd(interface, config)
def wait_for_event(self, event, timeout=10): def wait_for_event(self, event, timeout=10):
global mainloop global mainloop
self._wait_timed_out = False self._wait_timed_out = False
@ -84,6 +88,7 @@ class HostapdCLI:
while self._data_available(0.25): while self._data_available(0.25):
data = self.ctrl_sock.recv(4096).decode('utf-8') data = self.ctrl_sock.recv(4096).decode('utf-8')
if event in data: if event in data:
GLib.source_remove(timeout)
return data return data
if self._wait_timed_out: if self._wait_timed_out:
@ -108,11 +113,20 @@ class HostapdCLI:
raise Exception('timeout waiting for control response') raise Exception('timeout waiting for control response')
def __del__(self): def _del_hostapd(self, force=False):
self.ctrl_sock.close()
if self._hostapd_restarted: if self._hostapd_restarted:
if force:
os.system('killall -9 hostapd')
else:
os.system('killall hostapd') os.system('killall hostapd')
self.ctrl_sock.close() os.system('ifconfig %s down' % self.ifname)
os.system('ifconfig %s up' % self.ifname)
def __del__(self):
self._del_hostapd()
def wps_push_button(self): def wps_push_button(self):
os.system(self.cmdline + ' wps_pbc') os.system(self.cmdline + ' wps_pbc')
@ -193,15 +207,20 @@ class HostapdCLI:
''' '''
Ungracefully kill and restart hostapd Ungracefully kill and restart hostapd
''' '''
# set flag so hostapd can be killed after the test
self._hostapd_restarted = True
intf = hostapd_map[self.ifname] intf = hostapd_map[self.ifname]
os.system('killall -9 hostapd')
os.system('ifconfig %s down' % intf.name) self._del_hostapd(force=True)
os.system('ifconfig %s up' % intf.name)
os.system('hostapd -g %s -i %s %s &' % os.system('hostapd -g %s -i %s %s &' %
(intf.ctrl_interface, intf.name, intf.config)) (intf.ctrl_interface, intf.name, intf.config))
# set flag so hostapd can be killed after the test # Give hostapd a second to start and initialize the control interface
self._hostapd_restarted = True time.sleep(1)
# New hostapd process, so re-init
self._init_hostapd(intf)
def req_beacon(self, addr, request): def req_beacon(self, addr, request):
''' '''