Browse Source

tests: Fix peerkey_sniffer_check with tshark 1.10.6

It looks like the previous mechanism for catching older tshark versions
for EAPOL-Key key info field was not sufficient. Fix that to cover the
version used in Ubuntu 14.04.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Jouni Malinen 8 years ago
parent
commit
1e40cf22f4
1 changed files with 9 additions and 0 deletions
  1. 9 0
      tests/hwsim/test_peerkey.py

+ 9 - 0
tests/hwsim/test_peerkey.py

@@ -79,6 +79,15 @@ def test_peerkey_sniffer_check(dev, apdev, params):
             pass
         else:
             raise
+    if not try_other:
+        found = False
+        for pkt in out.splitlines():
+            sa, da, key_info = pkt.split('\t')
+            if key_info != '':
+                found = True
+                break
+        if not found:
+            try_other = True
     if try_other:
         out = run_tshark(os.path.join(params['logdir'], "hwsim0.pcapng"),
                          "eapol.type == 3",