From e0e6bd6a993f23a96985192095181bf411875d9c Mon Sep 17 00:00:00 2001
From: Yaro Kasear <git@kasear.net>
Date: Tue, 22 Apr 2025 08:34:34 -0500
Subject: [PATCH 1/2] Refactor run_iperf function to parse JSON output and
 improve error logging

---
 runtest.sh | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/runtest.sh b/runtest.sh
index d30fa21..7e3b0d3 100755
--- a/runtest.sh
+++ b/runtest.sh
@@ -71,29 +71,36 @@ run_iperf() {
   local tmp_err
   tmp_err=$(mktemp)
 
-  local result
-  result=$(iperf3 "${args[@]}" 2>"$tmp_err" | jq -r '
-    if .error then
-      "iperf3-error"
-    elif has("end") | not then
-      "no-end"
-    elif .end | has("sum_received") then
-      .end.sum_received.bits_per_second
-    elif .end | has("sum") then
-      .end.sum.bits_per_second
-    else
-      "unexpected-format"
-    end' || echo "execution-failed")
+  local tmp_json
+  tmp_json=$(mktemp)
 
-  if [[ "$result" == "iperf3-error" || "$result" == "no-end" || "$result" == "unexpected-format" || "$result" == "execution-failed" ]]; then
-    echo "$(date -Iseconds),iperf $mode $direction to $target failed with '$result'" >>"$FAILURE_LOG"
+  local result
+  result=$(iperf3 "${args[@]}" -J >"$tmp_json" 2>"$tmp_err")
+
+  parsed=$(jq -r '
+  if .error then
+    "iperf3-error"
+  elif has("end") | not then
+    "no-end"
+  elif .end | has("sum_received") then
+    .end.sum_received.bits_per_second
+  elif .end | has("sum") then
+    .end.sum.bits_per_second
+  else
+    "unexpected-format"
+  end' "$tmp_json" || echo "execution-failed")
+
+  if [[ "$parsed" == "iperf3-error" || "$parsed" == "no-end" || "$parsed" == "unexpected-format" || "$parsed" == "execution-failed" ]]; then
+    timestamp=$(date -Iseconds)
+    echo "$timestamp,iperf $mode $direction to $target failed with '$parsed'" >>"$FAILURE_LOG"
     echo "[stderr] $(cat "$tmp_err")" >>"$FAILURE_LOG"
+    echo "[json] $(cat "$tmp_json")" >>"$FAILURE_LOG"
     echo "0"
   else
-    echo "$result"
+    echo "$parsed"
   fi
 
-  rm -f "$tmp_err"
+  rm -f "$tmp_err" "$tmp_json"
 }
 
 # Start test email

From 7be1550278b17905ae378de335a0802d2c3726fa Mon Sep 17 00:00:00 2001
From: Yaro Kasear <git@kasear.net>
Date: Tue, 22 Apr 2025 08:43:56 -0500
Subject: [PATCH 2/2] Enhance analyze_pcap function to store multiple SSID
 encryption statuses and update summary output

---
 enrich.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/enrich.py b/enrich.py
index c1c6674..0badc68 100755
--- a/enrich.py
+++ b/enrich.py
@@ -393,9 +393,12 @@ def analyze_pcap(pcapng_path, start_ts, end_ts, ap_bssid, ap_channel):
                     continue
                 
                 ssid_hidden_status[ssid] = hidden_ssid
-                if ssid not in ssid_encryption_status:
-                    ssid_encryption_status[ssid] = is_open
-
+                # Store all observed values
+                if ssid in ssid_encryption_status:
+                    ssid_encryption_status[ssid].append(is_open)
+                else:
+                    ssid_encryption_status[ssid] = [is_open]
+                
                 ssid_packet_counts[ssid] += 1
 
                 bssid = getattr(wlan, 'bssid', '').lower()
@@ -434,7 +437,7 @@ def analyze_pcap(pcapng_path, start_ts, end_ts, ap_bssid, ap_channel):
             ssid_summary.append({
                 'SSID': ssid,
                 'Hidden': ssid_hidden_status.get(ssid, False),
-                'Open': ssid_encryption_status.get(ssid, True),
+                'Open': all(ssid_encryption_status.get(ssid, [True])),
                 'BSSID_Count': len(bssids),
                 'BSSIDs': ";".join(sorted(bssids)),
                 'Avg_Signal': mean(signals) if signals else 0,