From 3ef810ffd13790661f5d4f3657c57a6fdf1ace9b Mon Sep 17 00:00:00 2001 From: Martine Lenders Date: Tue, 19 Jun 2018 10:04:02 +0200 Subject: [PATCH] sniffer: adapt parsing script --- sniffer/tools/sniffer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sniffer/tools/sniffer.py b/sniffer/tools/sniffer.py index 7d09d217bd85..470520e81033 100755 --- a/sniffer/tools/sniffer.py +++ b/sniffer/tools/sniffer.py @@ -85,7 +85,7 @@ def generate_pcap(port, out): while True: line = port.readline().rstrip() - pkt_header = re.match(r">? *rftest-rx --- len 0x(\w\w).*", + pkt_header = re.match(r">? *rftest-rx --- len (\w+).*", line.decode(errors="ignore")) if pkt_header: now = time() @@ -98,10 +98,10 @@ def generate_pcap(port, out): sys.stderr.write("RX: %i\r" % count) continue - pkt_data = re.match(r"(0x\w\w )+", line.decode(errors="ignore")) + pkt_data = re.match(r"(\w\w )+", line.decode(errors="ignore")) if pkt_data: for part in line.decode(errors="ignore").split(' '): - byte = re.match(r"0x(\w\w)", part) + byte = re.match(r"(\w\w)", part) if byte: out.write(pack('