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

TDLS: Track TDLS channel switch prohibition in BSS

Browse source 
Mark an appropriate sm flag when TDLS switch is prohibited by the AP.
Populate the flag upon association with the AP.

Signed-off-by: Arik Nemtsov <arikx.nemtsov@intel.com>
This commit is contained in:
Arik Nemtsov 2014-12-28 22:35:18 -05:00 committed by Jouni Malinen
parent 4daa572925
commit d9d3b78c67
2 changed files with 37 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/rsn_supp/tdls.c
View file

@ -2833,39 +2833,61 @@ void wpa_tdls_disassoc(struct wpa_sm *sm)
} }
static int wpa_tdls_prohibited(const u8 *ies, size_t len) static int wpa_tdls_prohibited(struct wpa_eapol_ie_parse *elems)
{ {
struct wpa_eapol_ie_parse elems; /* bit 38 - TDLS Prohibited */
return !!(elems->ext_capab[2 + 4] & 0x40);
}
if (ies == NULL)
return 0;
if (wpa_supplicant_parse_ies(ies, len, &elems) < 0) static int wpa_tdls_chan_switch_prohibited(struct wpa_eapol_ie_parse *elems)
return 0; {
/* bit 39 - TDLS Channel Switch Prohibited */
if (elems.ext_capab == NULL || elems.ext_capab_len < 2 + 5) return !!(elems->ext_capab[2 + 4] & 0x80);
return 0;
/* bit 38 - TDLS Prohibited */
return !!(elems.ext_capab[2 + 4] & 0x40);
} }
void wpa_tdls_ap_ies(struct wpa_sm *sm, const u8 *ies, size_t len) void wpa_tdls_ap_ies(struct wpa_sm *sm, const u8 *ies, size_t len)
{ {
sm->tdls_prohibited = wpa_tdls_prohibited(ies, len); struct wpa_eapol_ie_parse elems;
sm->tdls_prohibited = 0;
sm->tdls_chan_switch_prohibited = 0;
if (ies == NULL || wpa_supplicant_parse_ies(ies, len, &elems) < 0 ||
elems.ext_capab == NULL || elems.ext_capab_len < 2 + 5)
return;
sm->tdls_prohibited = wpa_tdls_prohibited(&elems);
wpa_printf(MSG_DEBUG, "TDLS: TDLS is %s in the target BSS", wpa_printf(MSG_DEBUG, "TDLS: TDLS is %s in the target BSS",
sm->tdls_prohibited ? "prohibited" : "allowed"); sm->tdls_prohibited ? "prohibited" : "allowed");
sm->tdls_chan_switch_prohibited =
wpa_tdls_chan_switch_prohibited(&elems);
wpa_printf(MSG_DEBUG, "TDLS: TDLS channel switch %s in the target BSS",
sm->tdls_chan_switch_prohibited ? "prohibited" : "allowed");
} }
void wpa_tdls_assoc_resp_ies(struct wpa_sm *sm, const u8 *ies, size_t len) void wpa_tdls_assoc_resp_ies(struct wpa_sm *sm, const u8 *ies, size_t len)
{ {
if (!sm->tdls_prohibited && wpa_tdls_prohibited(ies, len)) { struct wpa_eapol_ie_parse elems;
if (ies == NULL || wpa_supplicant_parse_ies(ies, len, &elems) < 0 ||
elems.ext_capab == NULL || elems.ext_capab_len < 2 + 5)
return;
if (!sm->tdls_prohibited && wpa_tdls_prohibited(&elems)) {
wpa_printf(MSG_DEBUG, "TDLS: TDLS prohibited based on " wpa_printf(MSG_DEBUG, "TDLS: TDLS prohibited based on "
"(Re)Association Response IEs"); "(Re)Association Response IEs");
sm->tdls_prohibited = 1; sm->tdls_prohibited = 1;
} }
if (!sm->tdls_chan_switch_prohibited &&
wpa_tdls_chan_switch_prohibited(&elems)) {
wpa_printf(MSG_DEBUG,
"TDLS: TDLS channel switch prohibited based on (Re)Association Response IEs");
sm->tdls_chan_switch_prohibited = 1;
}
} }

1
src/rsn_supp/wpa_i.h
View file

@ -92,6 +92,7 @@ struct wpa_sm {
#ifdef CONFIG_TDLS #ifdef CONFIG_TDLS
struct wpa_tdls_peer *tdls; struct wpa_tdls_peer *tdls;
int tdls_prohibited; int tdls_prohibited;
int tdls_chan_switch_prohibited;
int tdls_disabled; int tdls_disabled;
/* The driver supports TDLS */ /* The driver supports TDLS */