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

utils.py update

Browse Source 
- Add WifiInfo.FREQUENCY to extract_from_pcap()
- Move the "Invalid field" to the the "else" as a default

Signed-off-by: Frédéric <fmatray@users.noreply.github.com>
This commit is contained in:
Frédéric
2025-02-09 01:32:59 +01:00
committed by GitHub
parent 5a113a2163
commit d4874a18e1
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pwnagotchi/utils.py
View File

@ -564,7 +564,8 @@ class WifiInfo(Enum):
ESSID = 1 ESSID = 1
ENCRYPTION = 2 ENCRYPTION = 2
CHANNEL = 3 CHANNEL = 3
RSSI = 4 FREQUENCY = 4
RSSI = 5
class FieldNotFoundError(Exception): class FieldNotFoundError(Exception):
@ -594,9 +595,6 @@ def extract_from_pcap(path, fields):
""" """
results = dict() results = dict()
for field in fields: for field in fields:
if not isinstance(field, WifiInfo):
raise TypeError("Invalid field")
subtypes = set() subtypes = set()
if field == WifiInfo.BSSID: if field == WifiInfo.BSSID:
@ -606,10 +604,9 @@ def extract_from_pcap(path, fields):
packets = sniff(offline=path, filter=bpf_filter) packets = sniff(offline=path, filter=bpf_filter)
try: try:
for packet in packets: for packet in packets:
if packet.haslayer(Dot11Beacon): if packet.haslayer(Dot11Beacon) and hasattr(packet[Dot11], 'addr3'):
if hasattr(packet[Dot11], 'addr3'): results[field] = packet[Dot11].addr3
results[field] = packet[Dot11].addr3 break
break
else: # magic else: # magic
raise FieldNotFoundError("Could not find field [BSSID]") raise FieldNotFoundError("Could not find field [BSSID]")
except Exception: except Exception:
@ -654,6 +651,14 @@ def extract_from_pcap(path, fields):
results[field] = freq_to_channel(packets[0][RadioTap].ChannelFrequency) results[field] = freq_to_channel(packets[0][RadioTap].ChannelFrequency)
except Exception: except Exception:
raise FieldNotFoundError("Could not find field [CHANNEL]") raise FieldNotFoundError("Could not find field [CHANNEL]")
elif field == WifiInfo.FREQUENCY:
from scapy.layers.dot11 import sniff, RadioTap
from pwnagotchi.mesh.wifi import freq_to_channel
packets = sniff(offline=path, count=1)
try:
results[field] = packets[0][RadioTap].ChannelFrequency
except Exception:
raise FieldNotFoundError("Could not find field [FREQUENCY]")
elif field == WifiInfo.RSSI: elif field == WifiInfo.RSSI:
from scapy.layers.dot11 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
@ -662,7 +667,8 @@ def extract_from_pcap(path, fields):
results[field] = packets[0][RadioTap].dBm_AntSignal results[field] = packets[0][RadioTap].dBm_AntSignal
except Exception: except Exception:
raise FieldNotFoundError("Could not find field [RSSI]") raise FieldNotFoundError("Could not find field [RSSI]")
else:
raise TypeError("Invalid field")
return results return results