DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

utils: Move log2pcap to python3

Browse source 
python2 is deprecated so move script to python3.
While at it, make some minor adjustments.

Signed-off-by: Mordechay Goodstein <mordechay.goodstein@intel.com>
Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
This commit is contained in:
Mordechay Goodstein 2023-01-02 16:44:16 +02:00 committed by Jouni Malinen
parent 12de8112b7
commit 2cff340d17
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
wpa_supplicant/utils/log2pcap.py
View file

@ -1,6 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python3
# #
# Copyright (c) 2012, Intel Corporation # Copyright (c) 2012-2022, Intel Corporation
# #
# Author: Johannes Berg <johannes@sipsolutions.net> # Author: Johannes Berg <johannes@sipsolutions.net>
# #
@ -8,6 +8,7 @@
# See README for more details. # See README for more details.
import sys, struct, re import sys, struct, re
from binascii import unhexlify
def write_pcap_header(pcap_file): def write_pcap_header(pcap_file):
pcap_file.write( pcap_file.write(
@ -32,7 +33,7 @@ if __name__ == "__main__":
sys.exit(2) sys.exit(2)
input_file = open(input, 'r') input_file = open(input, 'r')
pcap_file = open(pcap, 'w') pcap_file = open(pcap, 'wb')
frame_re = re.compile(r'(([0-9]+.[0-9]{6}):\s*)?nl80211: MLME event frame - hexdump\(len=[0-9]*\):((\s*[0-9a-fA-F]{2})*)') frame_re = re.compile(r'(([0-9]+.[0-9]{6}):\s*)?nl80211: MLME event frame - hexdump\(len=[0-9]*\):((\s*[0-9a-fA-F]{2})*)')
write_pcap_header(pcap_file) write_pcap_header(pcap_file)
@ -47,7 +48,7 @@ if __name__ == "__main__":
ts = 0 ts = 0
hexdata = m.group(3) hexdata = m.group(3)
hexdata = hexdata.split() hexdata = hexdata.split()
data = ''.join([chr(int(x, 16)) for x in hexdata]) data = unhexlify("".join(hexdata))
pcap_addpacket(pcap_file, ts, data) pcap_addpacket(pcap_file, ts, data)
input_file.close() input_file.close()