From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Fri, 13 Jan 2017 22:05:47 +0000 (+0200)
Subject: tests: Fix peerkey_sniffer_check with tshark 1.10.6
X-Git-Tag: hostap_2_7~1759
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e40cf22f436534de3882258018367b8f3232703;p=thirdparty%2Fhostap.git

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>
---

diff --git a/tests/hwsim/test_peerkey.py b/tests/hwsim/test_peerkey.py
index ec182851c..74c810257 100644
--- a/tests/hwsim/test_peerkey.py
+++ b/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",