DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Use shared function for figuring out if BSS is in use

Browse source 
The BSS that is currently in use must not be freed even if it does
not show up in scan results.
This commit is contained in:
Jouni Malinen 2010-01-03 10:55:31 +02:00
parent 9078adfc8c
commit 7d7d57b2dc
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
wpa_supplicant/bss.c
View file

@ -162,6 +162,14 @@ static void wpa_bss_update(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
} }
static int wpa_bss_in_use(struct wpa_supplicant *wpa_s, struct wpa_bss *bss)
{
return bss == wpa_s->current_bss ||
os_memcmp(bss->bssid, wpa_s->bssid, ETH_ALEN) == 0 ||
os_memcmp(bss->bssid, wpa_s->pending_bssid, ETH_ALEN) == 0;
}
void wpa_bss_update_start(struct wpa_supplicant *wpa_s) void wpa_bss_update_start(struct wpa_supplicant *wpa_s)
{ {
wpa_s->bss_update_idx++; wpa_s->bss_update_idx++;
@ -248,6 +256,8 @@ void wpa_bss_update_end(struct wpa_supplicant *wpa_s, struct scan_info *info,
return; /* do not expire entries without new scan */ return; /* do not expire entries without new scan */
dl_list_for_each_safe(bss, n, &wpa_s->bss, struct wpa_bss, list) { dl_list_for_each_safe(bss, n, &wpa_s->bss, struct wpa_bss, list) {
if (wpa_bss_in_use(wpa_s, bss))
continue;
if (!wpa_bss_included_in_scan(bss, info)) if (!wpa_bss_included_in_scan(bss, info))
continue; /* expire only BSSes that were scanned */ continue; /* expire only BSSes that were scanned */
if (bss->last_update_idx < wpa_s->bss_update_idx) if (bss->last_update_idx < wpa_s->bss_update_idx)
@ -274,10 +284,8 @@ static void wpa_bss_timeout(void *eloop_ctx, void *timeout_ctx)
t.sec -= WPA_BSS_EXPIRATION_AGE; t.sec -= WPA_BSS_EXPIRATION_AGE;
dl_list_for_each_safe(bss, n, &wpa_s->bss, struct wpa_bss, list) { dl_list_for_each_safe(bss, n, &wpa_s->bss, struct wpa_bss, list) {
if (bss == wpa_s->current_bss || if (wpa_bss_in_use(wpa_s, bss))
os_memcmp(bss->bssid, wpa_s->bssid, ETH_ALEN) == 0 || continue;
os_memcmp(bss->bssid, wpa_s->pending_bssid, ETH_ALEN) == 0)
continue; /* do not expire BSSes that are in use */
if (os_time_before(&bss->last_update, &t)) { if (os_time_before(&bss->last_update, &t)) {
wpa_printf(MSG_DEBUG, "BSS: Expire BSS %u due to age", wpa_printf(MSG_DEBUG, "BSS: Expire BSS %u due to age",