]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
tests: Fix dump_monitor() without monitor attached
authorJouni Malinen <j@w1.fi>
Sun, 17 Mar 2019 10:22:23 +0000 (12:22 +0200)
committerJouni Malinen <j@w1.fi>
Sun, 17 Mar 2019 10:22:23 +0000 (12:22 +0200)
Do not try to dump pending event messages if the monitor socket has not
been attached.

Signed-off-by: Jouni Malinen <j@w1.fi>
tests/hwsim/wpasupplicant.py

index aca05709df536832bf52454ff3ee9121f3522a54..06405df1fe1ad5f130c59e7a4952039e52bd5470 100644 (file)
@@ -627,7 +627,8 @@ class WpaSupplicant:
             else:
                 port = self.get_ctrl_iface_port(self.group_ifname)
                 self.gctrl_mon = wpaspy.Ctrl(self.hostname, port)
-            self.gctrl_mon.attach()
+            if self.monitor:
+                self.gctrl_mon.attach()
         except:
             logger.debug("Could not open monitor socket for group interface")
             self.gctrl_mon = None
@@ -829,11 +830,11 @@ class WpaSupplicant:
     def dump_monitor(self):
         count_iface = 0
         count_global = 0
-        while self.mon.pending():
+        while self.monitor and self.mon.pending():
             ev = self.mon.recv()
             logger.debug(self.dbg + ": " + ev)
             count_iface += 1
-        while self.global_mon and self.global_mon.pending():
+        while self.monitor and self.global_mon and self.global_mon.pending():
             ev = self.global_mon.recv()
             logger.debug(self.global_dbg + self.ifname + "(global): " + ev)
             count_global += 1