Prior to the BSS blacklist a BSS based autoconnect list made the most sense, but now station actually retries all BSS's upon failure. This means that for each BSS in the autoconnect list every other BSS under that SSID will be attempted to connect to if there is a failure. Essentially this is a network based autoconnect list, just an indirect way of doing it. Intead the autoconnect list can be purely network based, using the network rank for sorting. This avoids the need for a special autoconnect_entry struct as well as ensures the last connected network is chosen first (simply based on existing network ranking logic). --- src/station.c | 66 +++++++++++---------------------------------------- 1 file changed, 14 insertions(+), 52 deletions(-) diff --git a/src/station.c b/src/station.c index 479f81f5..aa9a70aa 100644 --- a/src/station.c +++ b/src/station.c @@ -152,12 +152,6 @@ static bool station_is_autoconnecting(struct station *station) station->state == STATION_STATE_AUTOCONNECT_QUICK; } -struct autoconnect_entry { - uint16_t rank; - struct network *network; - struct scan_bss *bss; -}; - static void station_property_set_scanning(struct station *station, bool scanning) { @@ -176,25 +170,23 @@ static void station_enter_state(struct station *station, static void station_autoconnect_next(struct station *station) { - struct autoconnect_entry *entry; + struct network *network; int r; - while ((entry = l_queue_pop_head(station->autoconnect_list))) { - const char *ssid = network_get_ssid(entry->network); + while ((network = l_queue_pop_head(station->autoconnect_list))) { + const char *ssid = network_get_ssid(network); + struct scan_bss *bss = network_bss_select(network, false); l_debug("Considering autoconnecting to BSS '%s' with SSID: %s," " freq: %u, rank: %u, strength: %i", - util_address_to_string(entry->bss->addr), ssid, - entry->bss->frequency, entry->rank, - entry->bss->signal_strength); + util_address_to_string(bss->addr), ssid, + bss->frequency, bss->rank, + bss->signal_strength); - if (blacklist_contains_bss(entry->bss->addr)) { - l_free(entry); + if (blacklist_contains_bss(bss->addr)) continue; - } - r = network_autoconnect(entry->network, entry->bss); - l_free(entry); + r = network_autoconnect(network, bss); if (!r) { station_enter_state(station, STATION_STATE_CONNECTING); @@ -212,33 +204,6 @@ static void station_autoconnect_next(struct station *station) } } -static int autoconnect_rank_compare(const void *a, const void *b, void *user) -{ - const struct autoconnect_entry *new_ae = a; - const struct autoconnect_entry *ae = b; - - return (ae->rank > new_ae->rank) ? 1 : -1; -} - -static void station_add_autoconnect_bss(struct station *station, - struct network *network, - struct scan_bss *bss) -{ - double rankmod; - struct autoconnect_entry *entry; - - /* See if network is autoconnectable (is a known network) */ - if (!network_rankmod(network, &rankmod)) - return; - - entry = l_new(struct autoconnect_entry, 1); - entry->network = network; - entry->bss = bss; - entry->rank = bss->rank * rankmod; - l_queue_insert(station->autoconnect_list, entry, - autoconnect_rank_compare, NULL); -} - static void bss_free(void *data) { struct scan_bss *bss = data; @@ -457,12 +422,9 @@ static bool match_nai_realms(const struct network_info *info, void *user_data) static void network_add_foreach(struct network *network, void *user_data) { struct station *station = user_data; - struct scan_bss *bss = network_bss_select(network, false); - - if (!bss) - return; - station_add_autoconnect_bss(station, network, bss); + l_queue_insert(station->autoconnect_list, network, + network_rank_compare, NULL); } static bool match_pending(const void *a, const void *b) @@ -553,7 +515,7 @@ request_done: /* Notify all watchers now that every ANQP request has finished */ l_queue_foreach_remove(station->anqp_pending, anqp_entry_foreach, NULL); - l_queue_destroy(station->autoconnect_list, l_free); + l_queue_destroy(station->autoconnect_list, NULL); station->autoconnect_list = l_queue_new(); if (station_is_autoconnecting(station)) { @@ -662,7 +624,7 @@ void station_set_scan_results(struct station *station, l_queue_clear(station->hidden_bss_list_sorted, NULL); - l_queue_destroy(station->autoconnect_list, l_free); + l_queue_destroy(station->autoconnect_list, NULL); station->autoconnect_list = l_queue_new(); station_bss_list_remove_expired_bsses(station, freqs); @@ -3600,7 +3562,7 @@ static void station_free(struct station *station) l_hashmap_destroy(station->networks, network_free); l_queue_destroy(station->bss_list, bss_free); l_queue_destroy(station->hidden_bss_list_sorted, NULL); - l_queue_destroy(station->autoconnect_list, l_free); + l_queue_destroy(station->autoconnect_list, NULL); watchlist_destroy(&station->state_watches); -- 2.31.1

--- src/iwd.config.rst | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/iwd.config.rst b/src/iwd.config.rst index 478bd616..8e3662d4 100644 --- a/src/iwd.config.rst +++ b/src/iwd.config.rst @@ -131,7 +131,14 @@ The group ``[General]`` contains general settings. * - RoamThreshold - Value: rssi dBm value, from -100 to 1, default: **-70** - This can be used to control how aggressively **iwd** roams. + This can be used to control how aggressively **iwd** roams from 2.4Ghz + networks. + + * - RoamThreshold5G + - Value: rssi dBm value, from -100 to 1, default: **-76** + + This value can be used to control how aggressively **iwd** roams from + 5GHz networks. * - RoamRetryInterval - Value: unsigned int value in seconds (default: **60**) -- 2.31.1

test-runner will print out if files were left behind after a test which lets the developer know something was not cleaned up. But in this case test-runner should also remove these files so they are not left, and printed, for each subsequent test. --- tools/test-runner | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/test-runner b/tools/test-runner index dd4cbf82..892e63ff 100755 --- a/tools/test-runner +++ b/tools/test-runner @@ -1186,6 +1186,7 @@ def post_test(ctx, to_copy): allowed = ['phonesim.conf', 'certs', 'secrets', 'iwd'] for f in [f for f in os.listdir('/tmp') if f not in allowed]: dbg("File %s was not cleaned up!" % f) + os.remove('/tmp/' + f) if ctx.args.valgrind: with open('/tmp/valgrind.log', 'r') as f: -- 2.31.1