Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-21 11:52:34 +01:00
Code Releases Activity

wiphy: Keep track of auto-connect candidates

Browse Source
This commit is contained in:
Denis Kenzior 2015-06-22 17:42:30 -05:00
parent a2be179f57
commit 002ca518c9
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/wiphy.c
View File

@ -47,6 +47,7 @@
#include "src/netdev.h" #include "src/netdev.h"
#include "src/mpdu.h" #include "src/mpdu.h"
#include "src/storage.h" #include "src/storage.h"
#include "src/network.h"
static struct l_genl *genl = NULL; static struct l_genl *genl = NULL;
static struct l_genl_family *nl80211 = NULL; static struct l_genl_family *nl80211 = NULL;
@ -84,6 +85,7 @@ struct netdev {
struct l_hashmap *networks; struct l_hashmap *networks;
struct scan_bss *connected_bss; struct scan_bss *connected_bss;
struct network *connected_network; struct network *connected_network;
struct l_queue *autoconnect_list;
struct l_dbus_message *connect_pending; struct l_dbus_message *connect_pending;
struct l_dbus_message *disconnect_pending; struct l_dbus_message *disconnect_pending;
struct l_io *eapol_io; struct l_io *eapol_io;
@ -105,6 +107,12 @@ struct wiphy {
uint16_t pairwise_ciphers; uint16_t pairwise_ciphers;
}; };
struct autoconnect_entry {
uint16_t rank;
struct network *network;
struct scan_bss *bss;
};
static struct l_queue *wiphy_list = NULL; static struct l_queue *wiphy_list = NULL;
static void do_debug(const char *str, void *user_data) static void do_debug(const char *str, void *user_data)
@ -907,6 +915,7 @@ static void netdev_free(void *data)
l_queue_destroy(netdev->bss_list, bss_free); l_queue_destroy(netdev->bss_list, bss_free);
l_queue_destroy(netdev->old_bss_list, bss_free); l_queue_destroy(netdev->old_bss_list, bss_free);
l_queue_destroy(netdev->autoconnect_list, l_free);
l_io_destroy(netdev->eapol_io); l_io_destroy(netdev->eapol_io);
netdev_set_linkmode_and_operstate(netdev->index, 0, IF_OPER_DOWN, netdev_set_linkmode_and_operstate(netdev->index, 0, IF_OPER_DOWN,
@ -1555,11 +1564,21 @@ static bool network_remove_if_lost(const void *key, void *data, void *user_data)
return true; return true;
} }
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;
}
static void process_bss(struct netdev *netdev, struct scan_bss *bss) static void process_bss(struct netdev *netdev, struct scan_bss *bss)
{ {
struct network *network; struct network *network;
enum scan_ssid_security ssid_security; enum scan_ssid_security ssid_security;
const char *path; const char *path;
double rankmod;
struct autoconnect_entry *entry;
l_debug("Found BSS '%s' with SSID: %s, freq: %u, rank: %u, " l_debug("Found BSS '%s' with SSID: %s, freq: %u, rank: %u, "
"strength: %i", "strength: %i",
@ -1627,9 +1646,22 @@ static void process_bss(struct netdev *netdev, struct scan_bss *bss)
IWD_NETWORK_INTERFACE); IWD_NETWORK_INTERFACE);
else else
network_emit_added(network); network_emit_added(network);
network_seen(network->ssid_security, network->ssid);
} }
l_queue_insert(network->bss_list, bss, scan_bss_rank_compare, NULL); l_queue_insert(network->bss_list, bss, scan_bss_rank_compare, NULL);
rankmod = network_rankmod(network->ssid_security, network->ssid);
if (rankmod == 0.0)
return;
entry = l_new(struct autoconnect_entry, 1);
entry->network = network;
entry->bss = bss;
entry->rank = bss->rank * rankmod;
l_queue_insert(netdev->autoconnect_list, entry,
autoconnect_rank_compare, NULL);
} }
static bool new_scan_results(uint32_t wiphy_id, uint32_t ifindex, static bool new_scan_results(uint32_t wiphy_id, uint32_t ifindex,
@ -1657,6 +1689,9 @@ static bool new_scan_results(uint32_t wiphy_id, uint32_t ifindex,
netdev->bss_list = bss_list; netdev->bss_list = bss_list;
l_hashmap_foreach(netdev->networks, network_reset_bss_list, NULL); l_hashmap_foreach(netdev->networks, network_reset_bss_list, NULL);
l_queue_destroy(netdev->autoconnect_list, l_free);
netdev->autoconnect_list = l_queue_new();
for (bss_entry = l_queue_get_entries(bss_list); bss_entry; for (bss_entry = l_queue_get_entries(bss_list); bss_entry;
bss_entry = bss_entry->next) { bss_entry = bss_entry->next) {
struct scan_bss *bss = bss_entry->data; struct scan_bss *bss = bss_entry->data;