chrissewell/pwnagotchi
1
0
Fork 0
mirror of https://github.com/jayofelony/pwnagotchi.git synced 2025-07-01 18:37:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update utils.py

Browse Source
This commit is contained in:
Jeroen Oudshoorn
2024-01-05 20:48:42 +01:00
parent a486f1bc75
commit 017ffd3792
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pwnagotchi/utils.py
View File

@ -1,4 +1,3 @@
import logging import logging
import glob import glob
import os import os
@ -385,7 +384,7 @@ def extract_from_pcap(path, fields):
subtypes = set() subtypes = set()
if field == WifiInfo.BSSID: if field == WifiInfo.BSSID:
from scapy.all import Dot11Beacon, Dot11ProbeResp, Dot11AssoReq, Dot11ReassoReq, Dot11, sniff from scapy.layers.dot11 import Dot11Beacon, Dot11ProbeResp, Dot11AssoReq, Dot11ReassoReq, Dot11, sniff
subtypes.add('beacon') subtypes.add('beacon')
bpf_filter = " or ".join([f"wlan type mgt subtype {subtype}" for subtype in subtypes]) bpf_filter = " or ".join([f"wlan type mgt subtype {subtype}" for subtype in subtypes])
packets = sniff(offline=path, filter=bpf_filter) packets = sniff(offline=path, filter=bpf_filter)
@ -400,7 +399,7 @@ def extract_from_pcap(path, fields):
except Exception: except Exception:
raise FieldNotFoundError("Could not find field [BSSID]") raise FieldNotFoundError("Could not find field [BSSID]")
elif field == WifiInfo.ESSID: elif field == WifiInfo.ESSID:
from scapy.all import Dot11Beacon, Dot11ReassoReq, Dot11AssoReq, Dot11, sniff, Dot11Elt from scapy.layers.dot11 import Dot11Beacon, Dot11ReassoReq, Dot11AssoReq, Dot11, sniff, Dot11Elt
subtypes.add('beacon') subtypes.add('beacon')
subtypes.add('assoc-req') subtypes.add('assoc-req')
subtypes.add('reassoc-req') subtypes.add('reassoc-req')
@ -416,7 +415,7 @@ def extract_from_pcap(path, fields):
except Exception: except Exception:
raise FieldNotFoundError("Could not find field [ESSID]") raise FieldNotFoundError("Could not find field [ESSID]")
elif field == WifiInfo.ENCRYPTION: elif field == WifiInfo.ENCRYPTION:
from scapy.all import Dot11Beacon, sniff from scapy.layers.dot11 import Dot11Beacon, sniff
subtypes.add('beacon') subtypes.add('beacon')
bpf_filter = " or ".join([f"wlan type mgt subtype {subtype}" for subtype in subtypes]) bpf_filter = " or ".join([f"wlan type mgt subtype {subtype}" for subtype in subtypes])
packets = sniff(offline=path, filter=bpf_filter) packets = sniff(offline=path, filter=bpf_filter)
@ -432,7 +431,7 @@ def extract_from_pcap(path, fields):
except Exception: except Exception:
raise FieldNotFoundError("Could not find field [ENCRYPTION]") raise FieldNotFoundError("Could not find field [ENCRYPTION]")
elif field == WifiInfo.CHANNEL: elif field == WifiInfo.CHANNEL:
from scapy.all import sniff, RadioTap from scapy.layers.dot11 import sniff, RadioTap
from pwnagotchi.mesh.wifi import freq_to_channel from pwnagotchi.mesh.wifi import freq_to_channel
packets = sniff(offline=path, count=1) packets = sniff(offline=path, count=1)
try: try:
@ -440,7 +439,7 @@ def extract_from_pcap(path, fields):
except Exception: except Exception:
raise FieldNotFoundError("Could not find field [CHANNEL]") raise FieldNotFoundError("Could not find field [CHANNEL]")
elif field == WifiInfo.RSSI: elif field == WifiInfo.RSSI:
from scapy.all import sniff, RadioTap from scapy.layers.dot11 import sniff, RadioTap
from pwnagotchi.mesh.wifi import freq_to_channel from pwnagotchi.mesh.wifi import freq_to_channel
packets = sniff(offline=path, count=1) packets = sniff(offline=path, count=1)
try: try: