wifi: select higher average rssi

Author: lws-team

lib/drivers/netdev/wifi.c

@@ -31,7 +31,7 @@ lws_netdev_wifi_rssi_sort_compare(const lws_dll2_t *d, const lws_dll2_t *i)
 {
 	const lws_wifi_sta_t *wsd = (const lws_wifi_sta_t *)d,
 			     *wsi = (const lws_wifi_sta_t *)i;
-	return rssi_averaged(wsd) > rssi_averaged(wsi);
+	return rssi_averaged(wsd) < rssi_averaged(wsi);
 }
 
 void
@@ -209,7 +209,7 @@ lws_netdev_wifi_redo_last(lws_netdev_instance_wifi_t *wnd)
 		return 1;
 
 	memcpy(ssid_copy, ssid, al);
-	ssid_copy[al + 1] = '\0';
+	ssid_copy[al] = '\0';
 
 	pb = lws_json_simple_find((const char *)buf, l, "\"bssid\":", &al);
 	if (!pb)

lib/plat/freertos/esp32/drivers/netdev/wifi-esp32.c

@@ -159,9 +159,9 @@ lws_esp32_scan_update(lws_netdev_instance_wifi_t *wnd)
 			w->ssid_len = m;
 
 			memcpy(w->bssid, ar->bssid, 6);
-
-			lws_dll2_add_sorted(&w->list, &wnd->scan,
-					    lws_netdev_wifi_rssi_sort_compare);
+		} else {
+			/* we will update the rssi and re-insert it */
+			lws_dll2_remove(&w->list);
 		}
 
 		if (w->rssi_count == LWS_ARRAY_SIZE(w->rssi))
@@ -172,6 +172,9 @@ lws_esp32_scan_update(lws_netdev_instance_wifi_t *wnd)
 		w->rssi_avg += w->rssi[w->rssi_next++];
 		w->rssi_next = w->rssi_next & (LWS_ARRAY_SIZE(w->rssi) - 1);
 
+		lws_dll2_add_sorted(&w->list, &wnd->scan,
+				    lws_netdev_wifi_rssi_sort_compare);
+
 		w->ch = ar->primary;
 		w->authmode = ar->authmode;
 		w->last_seen = now;
@@ -234,12 +237,9 @@ lws_netdev_wifi_event_plat(struct lws_netdev_instance *nd, lws_usec_t timestamp,
 		switch (atoi(ev)) {
 		case WIFI_EVENT_STA_START:
 			wnd->state = LWSNDVWIFI_STATE_INITIAL;
-			if (!lws_netdev_wifi_redo_last(wnd))
-				break;
 
 			/*
-			 * if the "try last successful" one fails, start the
-			 * scan by falling through
+			 * always start the scan by falling through
 			 */
 
 		case WIFI_EVENT_STA_DISCONNECTED: