]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
tests: Do not override connectivity test address if no driver info
authorJouni Malinen <j@w1.fi>
Mon, 24 Dec 2018 18:31:47 +0000 (20:31 +0200)
committerJouni Malinen <j@w1.fi>
Mon, 24 Dec 2018 18:31:47 +0000 (20:31 +0200)
Not all driver interfaces provide driver status information with the
local address, so skip the override step if the field is not available.
This is needed, e.g., with macsec_linux.

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

index 7a82df6e8c7961eba3be650d000fd415aeab1537..06d59c4f6428fa9224ed8183f45faccd04fec9c3 100644 (file)
@@ -16,11 +16,15 @@ def run_connectivity_test(dev1, dev2, tos, dev1group=False, dev2group=False,
                           multicast_to_unicast=False, broadcast=True):
     addr1 = dev1.own_addr()
     if not dev1group and isinstance(dev1, WpaSupplicant):
-        addr1 = dev1.get_driver_status_field('addr')
+        addr = dev1.get_driver_status_field('addr')
+        if addr:
+            addr1 = addr
 
     addr2 = dev2.own_addr()
     if not dev2group and isinstance(dev2, WpaSupplicant):
-        addr2 = dev2.get_driver_status_field('addr')
+        addr = dev2.get_driver_status_field('addr')
+        if addr:
+            addr2 = addr
 
     dev1.dump_monitor()
     dev2.dump_monitor()