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

hostapd: Fix CONFIG_INTERWORKING=y build without CONFIG_HS20=y

Browse source 
Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2012-09-15 22:37:27 -07:00
parent 54c61e6e08
commit ce6ce7fb13
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/ap/gas_serv.c
View file

@ -128,6 +128,7 @@ static void gas_serv_free_dialogs(struct hostapd_data *hapd,
} }
#ifdef CONFIG_HS20
static void anqp_add_hs_capab_list(struct hostapd_data *hapd, static void anqp_add_hs_capab_list(struct hostapd_data *hapd,
struct wpabuf *buf) struct wpabuf *buf)
{ {
@ -151,6 +152,7 @@ static void anqp_add_hs_capab_list(struct hostapd_data *hapd,
wpabuf_put_u8(buf, HS20_STYPE_OPERATING_CLASS); wpabuf_put_u8(buf, HS20_STYPE_OPERATING_CLASS);
gas_anqp_set_element_len(buf, len); gas_anqp_set_element_len(buf, len);
} }
#endif /* CONFIG_HS20 */
static void anqp_add_capab_list(struct hostapd_data *hapd, static void anqp_add_capab_list(struct hostapd_data *hapd,
@ -174,7 +176,9 @@ static void anqp_add_capab_list(struct hostapd_data *hapd,
wpabuf_put_le16(buf, ANQP_3GPP_CELLULAR_NETWORK); wpabuf_put_le16(buf, ANQP_3GPP_CELLULAR_NETWORK);
if (hapd->conf->domain_name) if (hapd->conf->domain_name)
wpabuf_put_le16(buf, ANQP_DOMAIN_NAME); wpabuf_put_le16(buf, ANQP_DOMAIN_NAME);
#ifdef CONFIG_HS20
anqp_add_hs_capab_list(hapd, buf); anqp_add_hs_capab_list(hapd, buf);
#endif /* CONFIG_HS20 */
gas_anqp_set_element_len(buf, len); gas_anqp_set_element_len(buf, len);
} }
@ -429,6 +433,8 @@ static void anqp_add_domain_name(struct hostapd_data *hapd, struct wpabuf *buf)
} }
#ifdef CONFIG_HS20
static void anqp_add_operator_friendly_name(struct hostapd_data *hapd, static void anqp_add_operator_friendly_name(struct hostapd_data *hapd,
struct wpabuf *buf) struct wpabuf *buf)
{ {
@ -499,6 +505,8 @@ static void anqp_add_operating_class(struct hostapd_data *hapd,
} }
} }
#endif /* CONFIG_HS20 */
static struct wpabuf * static struct wpabuf *
gas_serv_build_gas_resp_payload(struct hostapd_data *hapd, gas_serv_build_gas_resp_payload(struct hostapd_data *hapd,
@ -531,6 +539,7 @@ gas_serv_build_gas_resp_payload(struct hostapd_data *hapd,
if (request & ANQP_REQ_DOMAIN_NAME) if (request & ANQP_REQ_DOMAIN_NAME)
anqp_add_domain_name(hapd, buf); anqp_add_domain_name(hapd, buf);
#ifdef CONFIG_HS20
if (request & ANQP_REQ_HS_CAPABILITY_LIST) if (request & ANQP_REQ_HS_CAPABILITY_LIST)
anqp_add_hs_capab_list(hapd, buf); anqp_add_hs_capab_list(hapd, buf);
if (request & ANQP_REQ_OPERATOR_FRIENDLY_NAME) if (request & ANQP_REQ_OPERATOR_FRIENDLY_NAME)
@ -541,6 +550,7 @@ gas_serv_build_gas_resp_payload(struct hostapd_data *hapd,
anqp_add_connection_capability(hapd, buf); anqp_add_connection_capability(hapd, buf);
if (request & ANQP_REQ_OPERATING_CLASS) if (request & ANQP_REQ_OPERATING_CLASS)
anqp_add_operating_class(hapd, buf); anqp_add_operating_class(hapd, buf);
#endif /* CONFIG_HS20 */
return buf; return buf;
} }
@ -649,6 +659,8 @@ static void rx_anqp_query_list(struct hostapd_data *hapd,
} }
#ifdef CONFIG_HS20
static void rx_anqp_hs_query_list(struct hostapd_data *hapd, u8 subtype, static void rx_anqp_hs_query_list(struct hostapd_data *hapd, u8 subtype,
struct anqp_query_info *qi) struct anqp_query_info *qi)
{ {
@ -755,6 +767,8 @@ static void rx_anqp_vendor_specific(struct hostapd_data *hapd,
} }
} }
#endif /* CONFIG_HS20 */
static void gas_serv_req_local_processing(struct hostapd_data *hapd, static void gas_serv_req_local_processing(struct hostapd_data *hapd,
const u8 *sa, u8 dialog_token, const u8 *sa, u8 dialog_token,
@ -899,9 +913,11 @@ static void gas_serv_rx_gas_initial_req(struct hostapd_data *hapd,
case ANQP_QUERY_LIST: case ANQP_QUERY_LIST:
rx_anqp_query_list(hapd, pos, pos + elen, &qi); rx_anqp_query_list(hapd, pos, pos + elen, &qi);
break; break;
#ifdef CONFIG_HS20
case ANQP_VENDOR_SPECIFIC: case ANQP_VENDOR_SPECIFIC:
rx_anqp_vendor_specific(hapd, pos, pos + elen, &qi); rx_anqp_vendor_specific(hapd, pos, pos + elen, &qi);
break; break;
#endif /* CONFIG_HS20 */
default: default:
wpa_printf(MSG_DEBUG, "ANQP: Unsupported Query " wpa_printf(MSG_DEBUG, "ANQP: Unsupported Query "
"Request element %u", info_id); "Request element %u", info_id);