Refactor SSID metrics handling by removing Cisco client tracking and updating related functions for improved clarity and performance
This commit is contained in:
parent
7d5fe1fbf5
commit
0fd16d47f3
5 changed files with 10 additions and 60 deletions
10
enrich.py
10
enrich.py
|
@ -57,7 +57,6 @@ def analyze_pcap(pcapng_path, start_ts, end_ts, ap_bssid, ap_channel):
|
|||
ssid_signals = defaultdict(list)
|
||||
ssid_to_bssids = defaultdict(set)
|
||||
bssid_to_ssid = {}
|
||||
cisco_reported_clients = []
|
||||
ssid_packet_counts = defaultdict(int)
|
||||
|
||||
try:
|
||||
|
@ -73,7 +72,6 @@ def analyze_pcap(pcapng_path, start_ts, end_ts, ap_bssid, ap_channel):
|
|||
ssid_hidden_status,
|
||||
ssid_encryption_status,
|
||||
ssid_signals,
|
||||
cisco_reported_clients,
|
||||
ssid_packet_counts,
|
||||
ssid_clients
|
||||
) = extract_ssid_metrics(filtered_packets)
|
||||
|
@ -84,8 +82,6 @@ def analyze_pcap(pcapng_path, start_ts, end_ts, ap_bssid, ap_channel):
|
|||
aps_on_channel = get_aps_on_channel(filtered_packets, ap_channel)
|
||||
avg_ap_signal, max_ap_signal = calculate_signal_strength_stats(filtered_packets, ap_channel)
|
||||
unlinked_devices = get_unlinked_devices(filtered_packets, ap_channel)
|
||||
cisco_avg_reported_clients = mean(cisco_reported_clients) if cisco_reported_clients else 0
|
||||
cisco_max_reported_clients = max(cisco_reported_clients) if cisco_reported_clients else 0
|
||||
num_bssids = len(ssid_to_bssids[our_ssid]) if our_ssid in ssid_to_bssids else 0
|
||||
average_signal = mean(ssid_signals[our_ssid]) if our_ssid in ssid_signals else 0
|
||||
max_ssid_signal = max(ssid_signals[our_ssid]) if our_ssid in ssid_signals else 0
|
||||
|
@ -115,9 +111,8 @@ def analyze_pcap(pcapng_path, start_ts, end_ts, ap_bssid, ap_channel):
|
|||
return (
|
||||
clients_on_ap, clients_on_channel, aps_on_channel,
|
||||
avg_ap_signal, max_ap_signal, unlinked_devices,
|
||||
cisco_avg_reported_clients, cisco_max_reported_clients, num_bssids,
|
||||
average_signal, max_ssid_signal, num_channels_ssid,
|
||||
ssid_summary, packet_count
|
||||
num_bssids, average_signal, max_ssid_signal,
|
||||
num_channels_ssid, ssid_summary, packet_count
|
||||
)
|
||||
|
||||
def main():
|
||||
|
@ -158,7 +153,6 @@ def main():
|
|||
(
|
||||
clients_ap, clients_chan, aps_chan,
|
||||
avg_signal, strongest_signal, unlinked,
|
||||
cisco_avg_reported_clients, cisco_max_reported_clients,
|
||||
num_bssids, average_signal, max_ssid_signal,
|
||||
num_channels_ssid, packet_count
|
||||
) = result
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue