Skip to contentSkip to conversation

station: fix OWE scan logic with autoconnect

PATCH Applied James Prestwood 2 participants 2 messages Jan 19, 2022 – Jan 20, 2022

lore
Share & tools
lore

James Prestwood

author
#0 lore raw

PATCH 1/1 station: fix OWE scan logic with autoconnect

station_set_scan_results takes an autoconnect flag which was being set true in both regular/quick autoconnect scans. Since OWE networks are processed after setting the scan results IWD could end up connecting to a network before all the OWE hidden networks are populated.

To fix this regular/quick autoconnect results will set the flag to false, then process OWE networks, then start autoconnect. If any OWE network scans are pending station_autoconnect_start will fail but will pick back up after the hidden OWE scan.

---
 src/station.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
src/station.c +8 -2
index 38d0757c..e2f4a9f0 100644
@@ -1231,10 +1231,13 @@ static bool new_scan_results(int err, struct l_queue *bss_list,
 	if (err)
 		return false;
 
-	station_set_scan_results(station, bss_list, freqs, true);
+	station_set_scan_results(station, bss_list, freqs, false);
 
 	station_process_owe_transition_networks(station);
 
+	station->autoconnect_can_start = true;
+	station_autoconnect_start(station);
+
 	return true;
 }
 
@@ -1303,10 +1306,13 @@ static bool station_quick_scan_results(int err, struct l_queue *bss_list,
 	if (err)
 		goto done;
 
-	station_set_scan_results(station, bss_list, freqs, true);
+	station_set_scan_results(station, bss_list, freqs, false);
 
 	station_process_owe_transition_networks(station);
 
+	station->autoconnect_can_start = true;
+	station_autoconnect_start(station);
+
 done:
 	if (station->state == STATION_STATE_AUTOCONNECT_QUICK)
 		/*
Signature · 1 line
2.31.1
Applied
#1 lore raw

Hi James,

Quoted 6 lines · James Prestwood

station_set_scan_results takes an autoconnect flag which was being set true in both regular/quick autoconnect scans. Since OWE networks are processed after setting the scan results IWD could end up connecting to a network before all the OWE hidden networks are populated.

Quoted 8 lines

To fix this regular/quick autoconnect results will set the flag to false, then process OWE networks, then start autoconnect. If any OWE network scans are pending station_autoconnect_start will fail but will pick back up after the hidden OWE scan.

---
  src/station.c | 10 ++++++++--
  1 file changed, 8 insertions(+), 2 deletions(-)

Applied, thanks.

Regards,
Denis