From 07655ab249903377939f1ac36bb485892a8595f7 Mon Sep 17 00:00:00 2001 From: matthew Date: Fri, 3 Dec 2021 07:57:58 -0800 Subject: [PATCH] realm: DO NOT SHADOW BUILT IN FUNCTIONS!!!!!!!! DANGER!!! WARNING!!!! ALERT!!!! Signed-off-by: matthew --- py-json/realm.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/py-json/realm.py b/py-json/realm.py index f54ab523..60386070 100755 --- a/py-json/realm.py +++ b/py-json/realm.py @@ -990,20 +990,18 @@ class PacketFilter: @staticmethod def get_filter_wlan_assoc_packets(ap_mac, sta_mac): - filter = "-T fields -e wlan.fc.type_subtype -e wlan.addr -e wlan.fc.pwrmgt " \ + return "-T fields -e wlan.fc.type_subtype -e wlan.addr -e wlan.fc.pwrmgt " \ "-Y \"(wlan.addr==%s or wlan.addr==%s) and wlan.fc.type_subtype<=3\" " % (ap_mac, sta_mac) - return filter @staticmethod def get_filter_wlan_null_packets(ap_mac, sta_mac): - filter = "-T fields -e wlan.fc.type_subtype -e wlan.addr -e wlan.fc.pwrmgt " \ + return "-T fields -e wlan.fc.type_subtype -e wlan.addr -e wlan.fc.pwrmgt " \ "-Y \"(wlan.addr==%s or wlan.addr==%s) and wlan.fc.type_subtype==44\" " % (ap_mac, sta_mac) - return filter @staticmethod - def run_filter(pcap_file, filter): + def run_filter(pcap_file, file_filter): filename = "/tmp/tshark_dump.txt" - cmd = "tshark -r %s %s > %s" % (pcap_file, filter, filename) + cmd = "tshark -r %s %s > %s" % (pcap_file, file_filter, filename) # print("CMD: ", cmd) os.system(cmd) lines = []