Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-26 10:39:23 +01:00
Code Releases Activity

network: find hotspot network_info when adding BSS

Browse Source 
When adding a BSS to a network: if it is hs20_capable and no
'info' has been set we attempt to search for a matching
network_info for this network.
This commit is contained in:
James Prestwood 2019-08-19 11:11:57 -07:00 committed by Denis Kenzior
parent f4ef431e8d
commit 8910da5836
1 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/network.c
View File

@ -597,6 +597,31 @@ void network_connect_failed(struct network *network)
l_queue_clear(network->blacklist, NULL); l_queue_clear(network->blacklist, NULL);
} }
static bool match_hotspot_network(const struct network_info *info,
void *user_data)
{
struct network *network = user_data;
struct scan_bss *bss;
if (!info->is_hotspot)
return false;
bss = network_bss_select(network, false);
if (network_info_match_roaming_consortium(info, bss->rc_ie,
bss->rc_ie[1] + 2))
goto found;
if (network_info_match_hessid(info, bss->hessid))
goto found;
return false;
found:
network->info = (struct network_info *)info;
return true;
}
bool network_bss_add(struct network *network, struct scan_bss *bss) bool network_bss_add(struct network *network, struct scan_bss *bss)
{ {
if (!l_queue_insert(network->bss_list, bss, scan_bss_rank_compare, if (!l_queue_insert(network->bss_list, bss, scan_bss_rank_compare,
@ -606,15 +631,18 @@ bool network_bss_add(struct network *network, struct scan_bss *bss)
if (network->info) if (network->info)
known_network_add_frequency(network->info, bss->frequency); known_network_add_frequency(network->info, bss->frequency);
if (!util_mem_is_zero(bss->hessid, 6)) /* Done if BSS is not HS20 or we already have network_info set */
memcpy(network->hessid, bss->hessid, 6); if (!bss->hs20_capable)
return true;
if (bss->rc_ie && !network->rc_ie) else
network->rc_ie = l_memdup(bss->rc_ie, bss->rc_ie[1] + 2);
if (bss->hs20_capable)
network->is_hs20 = true; network->is_hs20 = true;
if (network->info)
return true;
/* Set the network_info to a matching hotspot entry, if found */
known_networks_foreach(match_hotspot_network, network);
return true; return true;
} }