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

Interworking: Fix wpa_supplicant build without CONFIG_HS20=y

Browse source 
Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2015-10-07 16:57:32 +03:00 committed by Jouni Malinen
parent 1c532fd5c0
commit 876e74aa5f
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wpa_supplicant/ctrl_iface.c
View file

@ -6877,7 +6877,9 @@ static void wpa_supplicant_ctrl_iface_flush(struct wpa_supplicant *wpa_s)
wpa_s->next_ssid = NULL; wpa_s->next_ssid = NULL;
#ifdef CONFIG_INTERWORKING #ifdef CONFIG_INTERWORKING
#ifdef CONFIG_HS20
hs20_cancel_fetch_osu(wpa_s); hs20_cancel_fetch_osu(wpa_s);
#endif /* CONFIG_HS20 */
#endif /* CONFIG_INTERWORKING */ #endif /* CONFIG_INTERWORKING */
wpa_s->ext_mgmt_frame_handling = 0; wpa_s->ext_mgmt_frame_handling = 0;

18
wpa_supplicant/interworking.c
View file

@ -1182,6 +1182,7 @@ static int cred_excluded_ssid(struct wpa_cred *cred, struct wpa_bss *bss)
static int cred_below_min_backhaul(struct wpa_supplicant *wpa_s, static int cred_below_min_backhaul(struct wpa_supplicant *wpa_s,
struct wpa_cred *cred, struct wpa_bss *bss) struct wpa_cred *cred, struct wpa_bss *bss)
{ {
#ifdef CONFIG_HS20
int res; int res;
unsigned int dl_bandwidth, ul_bandwidth; unsigned int dl_bandwidth, ul_bandwidth;
const u8 *wan; const u8 *wan;
@ -1233,6 +1234,7 @@ static int cred_below_min_backhaul(struct wpa_supplicant *wpa_s,
if (cred->min_ul_bandwidth_roaming > ul_bandwidth) if (cred->min_ul_bandwidth_roaming > ul_bandwidth)
return 1; return 1;
} }
#endif /* CONFIG_HS20 */
return 0; return 0;
} }
@ -1260,6 +1262,8 @@ static int cred_over_max_bss_load(struct wpa_supplicant *wpa_s,
} }
#ifdef CONFIG_HS20
static int has_proto_match(const u8 *pos, const u8 *end, u8 proto) static int has_proto_match(const u8 *pos, const u8 *end, u8 proto)
{ {
while (pos + 4 <= end) { while (pos + 4 <= end) {
@ -1285,10 +1289,13 @@ static int has_proto_port_match(const u8 *pos, const u8 *end, u8 proto,
return 0; return 0;
} }
#endif /* CONFIG_HS20 */
static int cred_conn_capab_missing(struct wpa_supplicant *wpa_s, static int cred_conn_capab_missing(struct wpa_supplicant *wpa_s,
struct wpa_cred *cred, struct wpa_bss *bss) struct wpa_cred *cred, struct wpa_bss *bss)
{ {
#ifdef CONFIG_HS20
int res; int res;
const u8 *capab, *end; const u8 *capab, *end;
unsigned int i, j; unsigned int i, j;
@ -1325,6 +1332,7 @@ static int cred_conn_capab_missing(struct wpa_supplicant *wpa_s,
} }
} }
} }
#endif /* CONFIG_HS20 */
return 0; return 0;
} }
@ -2564,11 +2572,13 @@ static void interworking_next_anqp_fetch(struct wpa_supplicant *wpa_s)
return; return;
} }
#ifdef CONFIG_HS20
if (wpa_s->fetch_osu_icon_in_progress) { if (wpa_s->fetch_osu_icon_in_progress) {
wpa_printf(MSG_DEBUG, "Interworking: Next icon (in progress)"); wpa_printf(MSG_DEBUG, "Interworking: Next icon (in progress)");
hs20_next_osu_icon(wpa_s); hs20_next_osu_icon(wpa_s);
return; return;
} }
#endif /* CONFIG_HS20 */
dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list) { dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list) {
if (!(bss->caps & IEEE80211_CAP_ESS)) if (!(bss->caps & IEEE80211_CAP_ESS))
@ -2602,6 +2612,7 @@ static void interworking_next_anqp_fetch(struct wpa_supplicant *wpa_s)
} }
if (found == 0) { if (found == 0) {
#ifdef CONFIG_HS20
if (wpa_s->fetch_osu_info) { if (wpa_s->fetch_osu_info) {
if (wpa_s->num_prov_found == 0 && if (wpa_s->num_prov_found == 0 &&
wpa_s->fetch_osu_waiting_scan && wpa_s->fetch_osu_waiting_scan &&
@ -2614,6 +2625,7 @@ static void interworking_next_anqp_fetch(struct wpa_supplicant *wpa_s)
hs20_osu_icon_fetch(wpa_s); hs20_osu_icon_fetch(wpa_s);
return; return;
} }
#endif /* CONFIG_HS20 */
wpa_msg(wpa_s, MSG_INFO, "ANQP fetch completed"); wpa_msg(wpa_s, MSG_INFO, "ANQP fetch completed");
wpa_s->fetch_anqp_in_progress = 0; wpa_s->fetch_anqp_in_progress = 0;
if (wpa_s->network_select) if (wpa_s->network_select)
@ -2907,8 +2919,10 @@ void anqp_resp_cb(void *ctx, const u8 *dst, u8 dialog_token,
" dialog_token=%u result=%d status_code=%u", " dialog_token=%u result=%d status_code=%u",
MAC2STR(dst), dialog_token, result, status_code); MAC2STR(dst), dialog_token, result, status_code);
if (result != GAS_QUERY_SUCCESS) { if (result != GAS_QUERY_SUCCESS) {
#ifdef CONFIG_HS20
if (wpa_s->fetch_osu_icon_in_progress) if (wpa_s->fetch_osu_icon_in_progress)
hs20_icon_fetch_failed(wpa_s); hs20_icon_fetch_failed(wpa_s);
#endif /* CONFIG_HS20 */
anqp_result = "FAILURE"; anqp_result = "FAILURE";
goto out; goto out;
} }
@ -2918,8 +2932,10 @@ void anqp_resp_cb(void *ctx, const u8 *dst, u8 dialog_token,
pos[1] < 2 || pos[3] != ACCESS_NETWORK_QUERY_PROTOCOL) { pos[1] < 2 || pos[3] != ACCESS_NETWORK_QUERY_PROTOCOL) {
wpa_msg(wpa_s, MSG_DEBUG, wpa_msg(wpa_s, MSG_DEBUG,
"ANQP: Unexpected Advertisement Protocol in response"); "ANQP: Unexpected Advertisement Protocol in response");
#ifdef CONFIG_HS20
if (wpa_s->fetch_osu_icon_in_progress) if (wpa_s->fetch_osu_icon_in_progress)
hs20_icon_fetch_failed(wpa_s); hs20_icon_fetch_failed(wpa_s);
#endif /* CONFIG_HS20 */
anqp_result = "INVALID_FRAME"; anqp_result = "INVALID_FRAME";
goto out; goto out;
} }
@ -2968,7 +2984,9 @@ void anqp_resp_cb(void *ctx, const u8 *dst, u8 dialog_token,
} }
out_parse_done: out_parse_done:
#ifdef CONFIG_HS20
hs20_notify_parse_done(wpa_s); hs20_notify_parse_done(wpa_s);
#endif /* CONFIG_HS20 */
out: out:
wpa_msg(wpa_s, MSG_INFO, ANQP_QUERY_DONE "addr=" MACSTR " result=%s", wpa_msg(wpa_s, MSG_INFO, ANQP_QUERY_DONE "addr=" MACSTR " result=%s",
MAC2STR(dst), anqp_result); MAC2STR(dst), anqp_result);