Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-22 13:02:44 +01:00
Code Releases Activity

station: Introduce an ordered list of hidden stations

Browse Source 
A sorted list of hidden network BSSs observed in the recent scan
is kept for the informational purposes of the clients. In addition,
it has deprecated the usage of seen_hidden_networks variable.
This commit is contained in:
Tim Kourt 2018-11-08 16:25:21 -08:00 committed by Denis Kenzior
parent 67f245a497
commit f803b0439b
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/station.c
View File

@ -58,6 +58,7 @@ struct station {
struct network *connected_network; struct network *connected_network;
struct l_queue *autoconnect_list; struct l_queue *autoconnect_list;
struct l_queue *bss_list; struct l_queue *bss_list;
struct l_queue *hidden_bss_list_sorted;
struct l_hashmap *networks; struct l_hashmap *networks;
struct l_queue *networks_sorted; struct l_queue *networks_sorted;
struct l_dbus_message *connect_pending; struct l_dbus_message *connect_pending;
@ -76,7 +77,6 @@ struct station {
struct wiphy *wiphy; struct wiphy *wiphy;
struct netdev *netdev; struct netdev *netdev;
bool seen_hidden_networks : 1;
bool preparing_roam : 1; bool preparing_roam : 1;
bool signal_low : 1; bool signal_low : 1;
bool roam_no_orig_ap : 1; bool roam_no_orig_ap : 1;
@ -235,6 +235,14 @@ struct network *station_network_find(struct station *station, const char *ssid,
return l_hashmap_lookup(station->networks, path); return l_hashmap_lookup(station->networks, path);
} }
static int bss_signal_strength_compare(const void *a, const void *b, void *user)
{
const struct scan_bss *new_bss = a;
const struct scan_bss *bss = b;
return bss->signal_strength - new_bss->signal_strength;
}
/* /*
* Returns the network object the BSS was added to or NULL if ignored. * Returns the network object the BSS was added to or NULL if ignored.
*/ */
@ -255,8 +263,10 @@ static struct network *station_add_seen_bss(struct station *station,
bss->frequency, bss->rank, bss->signal_strength); bss->frequency, bss->rank, bss->signal_strength);
if (util_ssid_is_hidden(bss->ssid_len, bss->ssid)) { if (util_ssid_is_hidden(bss->ssid_len, bss->ssid)) {
l_debug("Ignoring BSS with hidden SSID"); l_debug("BSS has hidden SSID");
station->seen_hidden_networks = true;
l_queue_insert(station->hidden_bss_list_sorted, bss,
bss_signal_strength_compare, NULL);
return NULL; return NULL;
} }
@ -327,7 +337,7 @@ void station_set_scan_results(struct station *station, struct l_queue *bss_list,
station->bss_list = bss_list; station->bss_list = bss_list;
station->seen_hidden_networks = false; l_queue_clear(station->hidden_bss_list_sorted, NULL);
while ((network = l_queue_pop_head(station->networks_sorted))) while ((network = l_queue_pop_head(station->networks_sorted)))
network_bss_list_clear(network); network_bss_list_clear(network);
@ -1939,7 +1949,7 @@ static struct l_dbus_message *station_dbus_scan(struct l_dbus *dbus,
* use passive scanning to hide our MAC address * use passive scanning to hide our MAC address
*/ */
if (!station->connected_bss && if (!station->connected_bss &&
!(station->seen_hidden_networks && !(!l_queue_isempty(station->hidden_bss_list_sorted) &&
known_networks_has_hidden())) { known_networks_has_hidden())) {
station->scan_id = scan_passive(index, station->scan_id = scan_passive(index,
station_dbus_scan_triggered, station_dbus_scan_triggered,
@ -2209,6 +2219,7 @@ static struct station *station_create(struct netdev *netdev)
watchlist_init(&station->state_watches, NULL); watchlist_init(&station->state_watches, NULL);
station->bss_list = l_queue_new(); station->bss_list = l_queue_new();
station->hidden_bss_list_sorted = l_queue_new();
station->networks = l_hashmap_new(); station->networks = l_hashmap_new();
l_hashmap_set_hash_function(station->networks, l_str_hash); l_hashmap_set_hash_function(station->networks, l_str_hash);
l_hashmap_set_compare_function(station->networks, l_hashmap_set_compare_function(station->networks,
@ -2271,6 +2282,7 @@ static void station_free(struct station *station)
l_queue_destroy(station->networks_sorted, NULL); l_queue_destroy(station->networks_sorted, NULL);
l_hashmap_destroy(station->networks, network_free); l_hashmap_destroy(station->networks, network_free);
l_queue_destroy(station->bss_list, bss_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, l_free);
watchlist_destroy(&station->state_watches); watchlist_destroy(&station->state_watches);