tests: Allow dump_monitor() to be used without global monitor interface

It is possible for WpaSupplicant instance to be used without the global
control socket, so allow dump_monitor() to handle this case cleanly.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2014-12-18 16:00:25 +02:00 committed by Jouni Malinen
parent 9d7fdac5b3
commit c8836a4f03

View file

@ -30,6 +30,8 @@ class WpaSupplicant:
self.global_ctrl = wpaspy.Ctrl(global_iface)
self.global_mon = wpaspy.Ctrl(global_iface)
self.global_mon.attach()
else:
self.global_mon = None
def set_ifname(self, ifname):
self.ifname = ifname
@ -641,7 +643,7 @@ class WpaSupplicant:
while self.mon.pending():
ev = self.mon.recv()
logger.debug(self.ifname + ": " + ev)
while self.global_mon.pending():
while self.global_mon and self.global_mon.pending():
ev = self.global_mon.recv()
logger.debug(self.ifname + "(global): " + ev)