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

WPS NFC: Connect using learnt credential after NFC Tag read

Browse source 
Instead of just adding the new network, prefer the network learnt from a
configuration token during the first connection attempt. This makes the
WPS NFC case behave similarly to the in-band provisioning cases if there
are more preferred networks in the scan results.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2013-05-15 16:46:45 +03:00 committed by Jouni Malinen
parent 0af2db7478
commit 170f5663dc
1 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
wpa_supplicant/wps_supplicant.c
View file

@ -964,21 +964,10 @@ static struct wpa_ssid * wpas_wps_add_network(struct wpa_supplicant *wpa_s,
} }
static void wpas_wps_reassoc(struct wpa_supplicant *wpa_s, static void wpas_wps_temp_disable(struct wpa_supplicant *wpa_s,
struct wpa_ssid *selected, const u8 *bssid) struct wpa_ssid *selected)
{ {
struct wpa_ssid *ssid; struct wpa_ssid *ssid;
struct wpa_bss *bss;
wpa_s->after_wps = 0;
wpa_s->known_wps_freq = 0;
if (bssid) {
bss = wpa_bss_get_bssid_latest(wpa_s, bssid);
if (bss && bss->freq > 0) {
wpa_s->known_wps_freq = 1;
wpa_s->wps_freq = bss->freq;
}
}
if (wpa_s->current_ssid) if (wpa_s->current_ssid)
wpa_supplicant_deauthenticate( wpa_supplicant_deauthenticate(
@ -1006,6 +995,26 @@ static void wpas_wps_reassoc(struct wpa_supplicant *wpa_s,
} }
ssid = ssid->next; ssid = ssid->next;
} }
}
static void wpas_wps_reassoc(struct wpa_supplicant *wpa_s,
struct wpa_ssid *selected, const u8 *bssid)
{
struct wpa_bss *bss;
wpa_s->after_wps = 0;
wpa_s->known_wps_freq = 0;
if (bssid) {
bss = wpa_bss_get_bssid_latest(wpa_s, bssid);
if (bss && bss->freq > 0) {
wpa_s->known_wps_freq = 1;
wpa_s->wps_freq = bss->freq;
}
}
wpas_wps_temp_disable(wpa_s, selected);
wpa_s->disconnected = 0; wpa_s->disconnected = 0;
wpa_s->reassociate = 1; wpa_s->reassociate = 1;
wpa_s->scan_runs = 0; wpa_s->scan_runs = 0;
@ -2087,6 +2096,15 @@ static int wpas_wps_use_cred(struct wpa_supplicant *wpa_s,
{ {
wpa_s->wps_ap_channel = 0; wpa_s->wps_ap_channel = 0;
/*
* Disable existing networks temporarily to allow the newly learned
* credential to be preferred. Enable the temporarily disabled networks
* after 10 seconds.
*/
wpas_wps_temp_disable(wpa_s, NULL);
eloop_register_timeout(10, 0, wpas_wps_reenable_networks_cb, wpa_s,
NULL);
if (wps_oob_use_cred(wpa_s->wps, attr) < 0) if (wps_oob_use_cred(wpa_s->wps, attr) < 0)
return -1; return -1;