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

Avoid use of C++ keyword in a header file

Browse source 
Don't use 'protected' as the name of the variable in bss.h since this
might be used in control interfaces that use C++.

Fixes: 1c77f3d3f9 ("Indicate whether additional ANQP elements were protected")
Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2021-02-21 12:48:13 +02:00
parent 10502ad59f
commit 1ba8a315cd
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wpa_supplicant/bss.h
View file

@ -33,7 +33,7 @@ struct wpa_scan_res;
struct wpa_bss_anqp_elem { struct wpa_bss_anqp_elem {
struct dl_list list; struct dl_list list;
u16 infoid; u16 infoid;
bool protected; /* received in a protected GAS response */ bool protected_response; /* received in a protected GAS response */
struct wpabuf *payload; struct wpabuf *payload;
}; };

2
wpa_supplicant/ctrl_iface.c
View file

@ -5330,7 +5330,7 @@ static int print_bss_info(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
os_snprintf(title, sizeof(title), "anqp[%u]", os_snprintf(title, sizeof(title), "anqp[%u]",
elem->infoid); elem->infoid);
pos = anqp_add_hex(pos, end, title, elem->payload); pos = anqp_add_hex(pos, end, title, elem->payload);
if (elem->protected) { if (elem->protected_response) {
ret = os_snprintf(pos, end - pos, ret = os_snprintf(pos, end - pos,
"protected-anqp-info[%u]=1\n", "protected-anqp-info[%u]=1\n",
elem->infoid); elem->infoid);

13
wpa_supplicant/interworking.c
View file

@ -2832,7 +2832,7 @@ int anqp_send_req(struct wpa_supplicant *wpa_s, const u8 *dst, int freq,
static void anqp_add_extra(struct wpa_supplicant *wpa_s, static void anqp_add_extra(struct wpa_supplicant *wpa_s,
struct wpa_bss_anqp *anqp, u16 info_id, struct wpa_bss_anqp *anqp, u16 info_id,
const u8 *data, size_t slen, bool protected) const u8 *data, size_t slen, bool protected_response)
{ {
struct wpa_bss_anqp_elem *tmp, *elem = NULL; struct wpa_bss_anqp_elem *tmp, *elem = NULL;
@ -2857,7 +2857,7 @@ static void anqp_add_extra(struct wpa_supplicant *wpa_s,
wpabuf_free(elem->payload); wpabuf_free(elem->payload);
} }
elem->protected = protected; elem->protected_response = protected_response;
elem->payload = wpabuf_alloc_copy(data, slen); elem->payload = wpabuf_alloc_copy(data, slen);
if (!elem->payload) { if (!elem->payload) {
dl_list_del(&elem->list); dl_list_del(&elem->list);
@ -2900,7 +2900,7 @@ static void interworking_parse_rx_anqp_resp(struct wpa_supplicant *wpa_s,
const u8 *pos = data; const u8 *pos = data;
struct wpa_bss_anqp *anqp = NULL; struct wpa_bss_anqp *anqp = NULL;
u8 type; u8 type;
bool protected; bool protected_response;
if (bss) if (bss)
anqp = bss->anqp; anqp = bss->anqp;
@ -3001,10 +3001,11 @@ static void interworking_parse_rx_anqp_resp(struct wpa_supplicant *wpa_s,
case ANQP_VENUE_URL: case ANQP_VENUE_URL:
wpa_msg(wpa_s, MSG_INFO, RX_ANQP MACSTR " Venue URL", wpa_msg(wpa_s, MSG_INFO, RX_ANQP MACSTR " Venue URL",
MAC2STR(sa)); MAC2STR(sa));
protected = pmf_in_use(wpa_s, sa); protected_response = pmf_in_use(wpa_s, sa);
anqp_add_extra(wpa_s, anqp, info_id, pos, slen, protected); anqp_add_extra(wpa_s, anqp, info_id, pos, slen,
protected_response);
if (!protected) { if (!protected_response) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"ANQP: Ignore Venue URL since PMF was not enabled"); "ANQP: Ignore Venue URL since PMF was not enabled");
break; break;