From c4ad7cb1af6860ba19faa924948e8ee56843243b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=BE=D1=80=D0=BE=D0=BA=D0=B8=D0=BD=20=D0=90=D0=BB?= =?UTF-8?q?=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80?= Date: Sun, 6 Nov 2016 20:48:58 +0300 Subject: [PATCH] Changed regex for support new version of tshark (2.2.1) --- py/Handshake.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py/Handshake.py b/py/Handshake.py index 2cfee77..a7a4060 100644 --- a/py/Handshake.py +++ b/py/Handshake.py @@ -135,7 +135,7 @@ class Handshake(object): for line in proc.stdout().split('\n'): # Extract source mac, destination mac, and message numbers mac_regex = ('[a-zA-Z0-9]{2}:' * 6)[:-1] - match = re.search('(%s) -> (%s).*Message.*(\d).*(\d)' + match = re.search('(%s) (?:->|→) (%s).*Message.*(\d).*(\d)' % (mac_regex, mac_regex), line) if match == None: # Line doesn't contain src, dst, Message numbers