jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

HS 2.0: Add optional no-scan parameter to FETCH_OSU

Browse source 
This is mainly for testing purposes to allow multiple FETCH_OSU ANQP
operations to be ran without having to wait for full scan between each
query.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2016-07-12 23:13:09 +03:00
parent 2752537926
commit dd20eabd16
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
wpa_supplicant/ctrl_iface.c
View file

@ -9053,7 +9053,10 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
if (del_hs20_icon(wpa_s, buf + 14) < 0) if (del_hs20_icon(wpa_s, buf + 14) < 0)
reply_len = -1; reply_len = -1;
} else if (os_strcmp(buf, "FETCH_OSU") == 0) { } else if (os_strcmp(buf, "FETCH_OSU") == 0) {
if (hs20_fetch_osu(wpa_s) < 0) if (hs20_fetch_osu(wpa_s, 0) < 0)
reply_len = -1;
} else if (os_strcmp(buf, "FETCH_OSU no-scan") == 0) {
if (hs20_fetch_osu(wpa_s, 1) < 0)
reply_len = -1; reply_len = -1;
} else if (os_strcmp(buf, "CANCEL_FETCH_OSU") == 0) { } else if (os_strcmp(buf, "CANCEL_FETCH_OSU") == 0) {
hs20_cancel_fetch_osu(wpa_s); hs20_cancel_fetch_osu(wpa_s);

11
wpa_supplicant/hs20_supplicant.c
View file

@ -1076,7 +1076,7 @@ static void hs20_osu_scan_res_handler(struct wpa_supplicant *wpa_s,
} }
int hs20_fetch_osu(struct wpa_supplicant *wpa_s) int hs20_fetch_osu(struct wpa_supplicant *wpa_s, int skip_scan)
{ {
if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED) { if (wpa_s->wpa_state == WPA_INTERFACE_DISABLED) {
wpa_printf(MSG_DEBUG, "HS 2.0: Cannot start fetch_osu - " wpa_printf(MSG_DEBUG, "HS 2.0: Cannot start fetch_osu - "
@ -1107,7 +1107,16 @@ int hs20_fetch_osu(struct wpa_supplicant *wpa_s)
wpa_msg(wpa_s, MSG_INFO, "Starting OSU provisioning information fetch"); wpa_msg(wpa_s, MSG_INFO, "Starting OSU provisioning information fetch");
wpa_s->num_osu_scans = 0; wpa_s->num_osu_scans = 0;
wpa_s->num_prov_found = 0; wpa_s->num_prov_found = 0;
if (skip_scan) {
wpa_s->network_select = 0;
wpa_s->fetch_all_anqp = 1;
wpa_s->fetch_osu_info = 1;
wpa_s->fetch_osu_icon_in_progress = 0;
interworking_start_fetch_anqp(wpa_s);
} else {
hs20_start_osu_scan(wpa_s); hs20_start_osu_scan(wpa_s);
}
return 0; return 0;
} }

2
wpa_supplicant/hs20_supplicant.h
View file

@ -31,7 +31,7 @@ void hs20_rx_deauth_imminent_notice(struct wpa_supplicant *wpa_s, u8 code,
void hs20_free_osu_prov(struct wpa_supplicant *wpa_s); void hs20_free_osu_prov(struct wpa_supplicant *wpa_s);
void hs20_next_osu_icon(struct wpa_supplicant *wpa_s); void hs20_next_osu_icon(struct wpa_supplicant *wpa_s);
void hs20_osu_icon_fetch(struct wpa_supplicant *wpa_s); void hs20_osu_icon_fetch(struct wpa_supplicant *wpa_s);
int hs20_fetch_osu(struct wpa_supplicant *wpa_s); int hs20_fetch_osu(struct wpa_supplicant *wpa_s, int skip_scan);
void hs20_cancel_fetch_osu(struct wpa_supplicant *wpa_s); void hs20_cancel_fetch_osu(struct wpa_supplicant *wpa_s);
void hs20_icon_fetch_failed(struct wpa_supplicant *wpa_s); void hs20_icon_fetch_failed(struct wpa_supplicant *wpa_s);
void hs20_start_osu_scan(struct wpa_supplicant *wpa_s); void hs20_start_osu_scan(struct wpa_supplicant *wpa_s);