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

GAS server: Add support for ANQP Roaming Consortium list

Browse source 
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2012-02-26 22:34:19 +02:00 committed by Jouni Malinen
parent dca30c3fb7
commit 3eaee4bf4b
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/ap/gas_serv.c
View file

@ -135,6 +135,25 @@ static void anqp_add_capab_list(struct hostapd_data *hapd,
len = gas_anqp_add_element(buf, ANQP_CAPABILITY_LIST); len = gas_anqp_add_element(buf, ANQP_CAPABILITY_LIST);
wpabuf_put_le16(buf, ANQP_CAPABILITY_LIST); wpabuf_put_le16(buf, ANQP_CAPABILITY_LIST);
if (hapd->conf->roaming_consortium)
wpabuf_put_le16(buf, ANQP_ROAMING_CONSORTIUM);
gas_anqp_set_element_len(buf, len);
}
static void anqp_add_roaming_consortium(struct hostapd_data *hapd,
struct wpabuf *buf)
{
unsigned int i;
u8 *len;
len = gas_anqp_add_element(buf, ANQP_ROAMING_CONSORTIUM);
for (i = 0; i < hapd->conf->roaming_consortium_count; i++) {
struct hostapd_roaming_consortium *rc;
rc = &hapd->conf->roaming_consortium[i];
wpabuf_put_u8(buf, rc->len);
wpabuf_put_data(buf, rc->oi, rc->len);
}
gas_anqp_set_element_len(buf, len); gas_anqp_set_element_len(buf, len);
} }
@ -152,6 +171,8 @@ gas_serv_build_gas_resp_payload(struct hostapd_data *hapd,
if (request & ANQP_REQ_CAPABILITY_LIST) if (request & ANQP_REQ_CAPABILITY_LIST)
anqp_add_capab_list(hapd, buf); anqp_add_capab_list(hapd, buf);
if (request & ANQP_REQ_ROAMING_CONSORTIUM)
anqp_add_roaming_consortium(hapd, buf);
return buf; return buf;
} }
@ -203,6 +224,10 @@ static void rx_anqp_query_list_id(struct hostapd_data *hapd, u16 info_id,
set_anqp_req(ANQP_REQ_CAPABILITY_LIST, "Capability List", 1, 0, set_anqp_req(ANQP_REQ_CAPABILITY_LIST, "Capability List", 1, 0,
0, qi); 0, qi);
break; break;
case ANQP_ROAMING_CONSORTIUM:
set_anqp_req(ANQP_REQ_ROAMING_CONSORTIUM, "Roaming Consortium",
hapd->conf->roaming_consortium != NULL, 0, 0, qi);
break;
default: default:
wpa_printf(MSG_DEBUG, "ANQP: Unsupported Info Id %u", wpa_printf(MSG_DEBUG, "ANQP: Unsupported Info Id %u",
info_id); info_id);

2
src/ap/gas_serv.h
View file

@ -11,6 +11,8 @@
#define ANQP_REQ_CAPABILITY_LIST \ #define ANQP_REQ_CAPABILITY_LIST \
(1 << (ANQP_CAPABILITY_LIST - ANQP_QUERY_LIST)) (1 << (ANQP_CAPABILITY_LIST - ANQP_QUERY_LIST))
#define ANQP_REQ_ROAMING_CONSORTIUM \
(1 << (ANQP_ROAMING_CONSORTIUM - ANQP_QUERY_LIST))
/* To account for latencies between hostapd and external ANQP processor */ /* To account for latencies between hostapd and external ANQP processor */
#define GAS_SERV_COMEBACK_DELAY_FUDGE 10 #define GAS_SERV_COMEBACK_DELAY_FUDGE 10