MBO: Add Supported Operating Classes element to Association Request
Signed-off-by: Avraham Stern <avraham.stern@intel.com>
This commit is contained in:
Avraham Stern
Jouni Malinen
parent
7d46f586de
commit
5e57ba2505
4 changed files with 305 additions and 19 deletions
|
|
@ -368,3 +368,255 @@ void wpas_mbo_scan_ie(struct wpa_supplicant *wpa_s, struct wpabuf *ie)
|
|||
wpabuf_put_u8(ie, 1);
|
||||
wpabuf_put_u8(ie, wpa_s->conf->mbo_cell_capa);
|
||||
}
|
||||
|
||||
|
||||
enum chan_allowed {
|
||||
NOT_ALLOWED, ALLOWED
|
||||
};
|
||||
|
||||
static enum chan_allowed allow_channel(struct hostapd_hw_modes *mode, u8 chan,
|
||||
unsigned int *flags)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < mode->num_channels; i++) {
|
||||
if (mode->channels[i].chan == chan)
|
||||
break;
|
||||
}
|
||||
|
||||
if (i == mode->num_channels ||
|
||||
(mode->channels[i].flag & HOSTAPD_CHAN_DISABLED))
|
||||
return NOT_ALLOWED;
|
||||
|
||||
if (flags)
|
||||
*flags = mode->channels[i].flag;
|
||||
|
||||
return ALLOWED;
|
||||
}
|
||||
|
||||
|
||||
static int get_center_80mhz(struct hostapd_hw_modes *mode, u8 channel)
|
||||
{
|
||||
u8 center_channels[] = {42, 58, 106, 122, 138, 155};
|
||||
size_t i;
|
||||
|
||||
if (mode->mode != HOSTAPD_MODE_IEEE80211A)
|
||||
return 0;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(center_channels); i++) {
|
||||
/*
|
||||
* In 80 MHz, the bandwidth "spans" 12 channels (e.g., 36-48),
|
||||
* so the center channel is 6 channels away from the start/end.
|
||||
*/
|
||||
if (channel >= center_channels[i] - 6 &&
|
||||
channel <= center_channels[i] + 6)
|
||||
return center_channels[i];
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static enum chan_allowed verify_80mhz(struct hostapd_hw_modes *mode, u8 channel)
|
||||
{
|
||||
u8 center_chan;
|
||||
unsigned int i;
|
||||
|
||||
center_chan = get_center_80mhz(mode, channel);
|
||||
if (!center_chan)
|
||||
return NOT_ALLOWED;
|
||||
|
||||
/* check all the channels are available */
|
||||
for (i = 0; i < 4; i++) {
|
||||
unsigned int flags;
|
||||
u8 adj_chan = center_chan - 6 + i * 4;
|
||||
|
||||
if (allow_channel(mode, adj_chan, &flags) == NOT_ALLOWED)
|
||||
return NOT_ALLOWED;
|
||||
|
||||
if ((i == 0 && !(flags & HOSTAPD_CHAN_VHT_10_70)) ||
|
||||
(i == 1 && !(flags & HOSTAPD_CHAN_VHT_30_50)) ||
|
||||
(i == 2 && !(flags & HOSTAPD_CHAN_VHT_50_30)) ||
|
||||
(i == 3 && !(flags & HOSTAPD_CHAN_VHT_70_10)))
|
||||
return NOT_ALLOWED;
|
||||
}
|
||||
|
||||
return ALLOWED;
|
||||
}
|
||||
|
||||
|
||||
static int get_center_160mhz(struct hostapd_hw_modes *mode, u8 channel)
|
||||
{
|
||||
u8 center_channels[] = { 50, 114 };
|
||||
unsigned int i;
|
||||
|
||||
if (mode->mode != HOSTAPD_MODE_IEEE80211A)
|
||||
return 0;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(center_channels); i++) {
|
||||
/*
|
||||
* In 160 MHz, the bandwidth "spans" 28 channels (e.g., 36-64),
|
||||
* so the center channel is 14 channels away from the start/end.
|
||||
*/
|
||||
if (channel >= center_channels[i] - 14 &&
|
||||
channel <= center_channels[i] + 14)
|
||||
return center_channels[i];
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static enum chan_allowed verify_160mhz(struct hostapd_hw_modes *mode,
|
||||
u8 channel)
|
||||
{
|
||||
u8 center_chan;
|
||||
unsigned int i;
|
||||
|
||||
center_chan = get_center_160mhz(mode, channel);
|
||||
if (!center_chan)
|
||||
return NOT_ALLOWED;
|
||||
|
||||
/* Check all the channels are available */
|
||||
for (i = 0; i < 8; i++) {
|
||||
unsigned int flags;
|
||||
u8 adj_chan = center_chan - 14 + i * 4;
|
||||
|
||||
if (allow_channel(mode, adj_chan, &flags) == NOT_ALLOWED)
|
||||
return NOT_ALLOWED;
|
||||
|
||||
if ((i == 0 && !(flags & HOSTAPD_CHAN_VHT_10_150)) ||
|
||||
(i == 1 && !(flags & HOSTAPD_CHAN_VHT_30_130)) ||
|
||||
(i == 2 && !(flags & HOSTAPD_CHAN_VHT_50_110)) ||
|
||||
(i == 3 && !(flags & HOSTAPD_CHAN_VHT_70_90)) ||
|
||||
(i == 4 && !(flags & HOSTAPD_CHAN_VHT_90_70)) ||
|
||||
(i == 5 && !(flags & HOSTAPD_CHAN_VHT_110_50)) ||
|
||||
(i == 6 && !(flags & HOSTAPD_CHAN_VHT_130_30)) ||
|
||||
(i == 7 && !(flags & HOSTAPD_CHAN_VHT_150_10)))
|
||||
return NOT_ALLOWED;
|
||||
}
|
||||
|
||||
return ALLOWED;
|
||||
}
|
||||
|
||||
|
||||
enum chan_allowed verify_channel(struct hostapd_hw_modes *mode, u8 channel,
|
||||
u8 bw)
|
||||
{
|
||||
unsigned int flag = 0;
|
||||
enum chan_allowed res, res2;
|
||||
|
||||
res2 = res = allow_channel(mode, channel, &flag);
|
||||
if (bw == BW40MINUS) {
|
||||
if (!(flag & HOSTAPD_CHAN_HT40MINUS))
|
||||
return NOT_ALLOWED;
|
||||
res2 = allow_channel(mode, channel - 4, NULL);
|
||||
} else if (bw == BW40PLUS) {
|
||||
if (!(flag & HOSTAPD_CHAN_HT40PLUS))
|
||||
return NOT_ALLOWED;
|
||||
res2 = allow_channel(mode, channel + 4, NULL);
|
||||
} else if (bw == BW80) {
|
||||
res2 = verify_80mhz(mode, channel);
|
||||
} else if (bw == BW160) {
|
||||
res2 = verify_160mhz(mode, channel);
|
||||
}
|
||||
|
||||
if (res == NOT_ALLOWED || res2 == NOT_ALLOWED)
|
||||
return NOT_ALLOWED;
|
||||
|
||||
return ALLOWED;
|
||||
}
|
||||
|
||||
|
||||
static int wpas_op_class_supported(struct wpa_supplicant *wpa_s,
|
||||
const struct oper_class_map *op_class)
|
||||
{
|
||||
int chan;
|
||||
size_t i;
|
||||
struct hostapd_hw_modes *mode;
|
||||
|
||||
mode = get_mode(wpa_s->hw.modes, wpa_s->hw.num_modes, op_class->mode);
|
||||
if (!mode)
|
||||
return 0;
|
||||
|
||||
if (op_class->op_class == 128 || op_class->op_class == 130) {
|
||||
u8 channels[] = { 42, 58, 106, 122, 138, 155 };
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(channels); i++) {
|
||||
if (verify_channel(mode, channels[i], op_class->bw) ==
|
||||
NOT_ALLOWED)
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (op_class->op_class == 129) {
|
||||
if (verify_channel(mode, 50, op_class->bw) == NOT_ALLOWED ||
|
||||
verify_channel(mode, 114, op_class->bw) == NOT_ALLOWED)
|
||||
return 0;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
for (chan = op_class->min_chan; chan <= op_class->max_chan;
|
||||
chan += op_class->inc) {
|
||||
if (verify_channel(mode, chan, op_class->bw) == NOT_ALLOWED)
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
int wpas_mbo_supp_op_class_ie(struct wpa_supplicant *wpa_s, int freq, u8 *pos,
|
||||
size_t len)
|
||||
{
|
||||
struct wpabuf *buf;
|
||||
u8 op, current, chan;
|
||||
u8 *ie_len;
|
||||
int res;
|
||||
|
||||
/*
|
||||
* Assume 20 MHz channel for now.
|
||||
* TODO: Use the secondary channel and VHT channel width that will be
|
||||
* used after association.
|
||||
*/
|
||||
if (ieee80211_freq_to_channel_ext(freq, 0, VHT_CHANWIDTH_USE_HT,
|
||||
¤t, &chan) == NUM_HOSTAPD_MODES)
|
||||
return 0;
|
||||
|
||||
/*
|
||||
* Need 3 bytes for EID, length, and current operating class, plus
|
||||
* 1 byte for every other supported operating class.
|
||||
*/
|
||||
buf = wpabuf_alloc(global_op_class_size + 3);
|
||||
if (!buf)
|
||||
return 0;
|
||||
|
||||
wpabuf_put_u8(buf, WLAN_EID_SUPPORTED_OPERATING_CLASSES);
|
||||
/* Will set the length later, putting a placeholder */
|
||||
ie_len = wpabuf_put(buf, 1);
|
||||
wpabuf_put_u8(buf, current);
|
||||
|
||||
for (op = 0; global_op_class[op].op_class; op++) {
|
||||
if (wpas_op_class_supported(wpa_s, &global_op_class[op]))
|
||||
wpabuf_put_u8(buf, global_op_class[op].op_class);
|
||||
}
|
||||
|
||||
*ie_len = wpabuf_len(buf) - 2;
|
||||
if (*ie_len < 2 || wpabuf_len(buf) > len) {
|
||||
wpa_printf(MSG_ERROR,
|
||||
"Failed to add supported operating classes IE");
|
||||
res = 0;
|
||||
} else {
|
||||
os_memcpy(pos, wpabuf_head(buf), wpabuf_len(buf));
|
||||
res = wpabuf_len(buf);
|
||||
wpa_hexdump_buf(MSG_DEBUG,
|
||||
"MBO: Added supported operating classes IE",
|
||||
buf);
|
||||
}
|
||||
|
||||
wpabuf_free(buf);
|
||||
return res;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -208,6 +208,9 @@ static void sme_send_authentication(struct wpa_supplicant *wpa_s,
|
|||
u8 ext_capab[18];
|
||||
int ext_capab_len;
|
||||
int skip_auth;
|
||||
#ifdef CONFIG_MBO
|
||||
const u8 *mbo;
|
||||
#endif /* CONFIG_MBO */
|
||||
|
||||
if (bss == NULL) {
|
||||
wpa_msg(wpa_s, MSG_ERROR, "SME: No scan result available for "
|
||||
|
|
@ -453,6 +456,21 @@ static void sme_send_authentication(struct wpa_supplicant *wpa_s,
|
|||
}
|
||||
#endif /* CONFIG_FST */
|
||||
|
||||
#ifdef CONFIG_MBO
|
||||
mbo = wpa_bss_get_vendor_ie(bss, MBO_IE_VENDOR_TYPE);
|
||||
if (mbo) {
|
||||
int len;
|
||||
|
||||
len = wpas_mbo_supp_op_class_ie(
|
||||
wpa_s, bss->freq,
|
||||
wpa_s->sme.assoc_req_ie + wpa_s->sme.assoc_req_ie_len,
|
||||
sizeof(wpa_s->sme.assoc_req_ie) -
|
||||
wpa_s->sme.assoc_req_ie_len);
|
||||
if (len > 0)
|
||||
wpa_s->sme.assoc_req_ie_len += len;
|
||||
}
|
||||
#endif /* CONFIG_MBO */
|
||||
|
||||
ext_capab_len = wpas_build_ext_capab(wpa_s, ext_capab,
|
||||
sizeof(ext_capab));
|
||||
if (ext_capab_len > 0) {
|
||||
|
|
@ -483,17 +501,15 @@ static void sme_send_authentication(struct wpa_supplicant *wpa_s,
|
|||
sme_auth_handle_rrm(wpa_s, bss);
|
||||
|
||||
#ifdef CONFIG_MBO
|
||||
if (wpa_bss_get_vendor_ie(bss, MBO_IE_VENDOR_TYPE)) {
|
||||
u8 *pos;
|
||||
size_t len;
|
||||
int res;
|
||||
if (mbo) {
|
||||
int len;
|
||||
|
||||
pos = wpa_s->sme.assoc_req_ie + wpa_s->sme.assoc_req_ie_len;
|
||||
len = sizeof(wpa_s->sme.assoc_req_ie) -
|
||||
wpa_s->sme.assoc_req_ie_len;
|
||||
res = wpas_mbo_ie(wpa_s, pos, len);
|
||||
if (res >= 0)
|
||||
wpa_s->sme.assoc_req_ie_len += res;
|
||||
len = wpas_mbo_ie(wpa_s, wpa_s->sme.assoc_req_ie +
|
||||
wpa_s->sme.assoc_req_ie_len,
|
||||
sizeof(wpa_s->sme.assoc_req_ie) -
|
||||
wpa_s->sme.assoc_req_ie_len);
|
||||
if (len >= 0)
|
||||
wpa_s->sme.assoc_req_ie_len += len;
|
||||
}
|
||||
#endif /* CONFIG_MBO */
|
||||
|
||||
|
|
|
|||
|
|
@ -2053,6 +2053,9 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
|
|||
struct ieee80211_vht_capabilities vhtcaps;
|
||||
struct ieee80211_vht_capabilities vhtcaps_mask;
|
||||
#endif /* CONFIG_VHT_OVERRIDES */
|
||||
#ifdef CONFIG_MBO
|
||||
const u8 *mbo = NULL;
|
||||
#endif /* CONFIG_MBO */
|
||||
|
||||
if (deinit) {
|
||||
if (work->started) {
|
||||
|
|
@ -2257,6 +2260,22 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
|
|||
}
|
||||
#endif /* CONFIG_HS20 */
|
||||
|
||||
#ifdef CONFIG_MBO
|
||||
if (bss) {
|
||||
mbo = wpa_bss_get_vendor_ie(bss, MBO_IE_VENDOR_TYPE);
|
||||
if (mbo) {
|
||||
int len;
|
||||
|
||||
len = wpas_mbo_supp_op_class_ie(wpa_s, bss->freq,
|
||||
wpa_ie + wpa_ie_len,
|
||||
sizeof(wpa_ie) -
|
||||
wpa_ie_len);
|
||||
if (len > 0)
|
||||
wpa_ie_len += len;
|
||||
}
|
||||
}
|
||||
#endif /* CONFIG_MBO */
|
||||
|
||||
/*
|
||||
* Workaround: Add Extended Capabilities element only if the AP
|
||||
* included this element in Beacon/Probe Response frames. Some older
|
||||
|
|
@ -2306,16 +2325,13 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
|
|||
#endif /* CONFIG_FST */
|
||||
|
||||
#ifdef CONFIG_MBO
|
||||
if (wpa_bss_get_vendor_ie(bss, MBO_IE_VENDOR_TYPE)) {
|
||||
u8 *pos;
|
||||
size_t len;
|
||||
int res;
|
||||
if (mbo) {
|
||||
int len;
|
||||
|
||||
pos = wpa_ie + wpa_ie_len;
|
||||
len = sizeof(wpa_ie) - wpa_ie_len;
|
||||
res = wpas_mbo_ie(wpa_s, pos, len);
|
||||
if (res >= 0)
|
||||
wpa_ie_len += res;
|
||||
len = wpas_mbo_ie(wpa_s, wpa_ie + wpa_ie_len,
|
||||
sizeof(wpa_ie) - wpa_ie_len);
|
||||
if (len >= 0)
|
||||
wpa_ie_len += len;
|
||||
}
|
||||
#endif /* CONFIG_MBO */
|
||||
|
||||
|
|
|
|||
|
|
@ -1148,6 +1148,8 @@ const u8 * wpas_mbo_get_bss_attr(struct wpa_bss *bss, enum mbo_attr_id attr);
|
|||
int wpas_mbo_update_non_pref_chan(struct wpa_supplicant *wpa_s,
|
||||
const char *non_pref_chan);
|
||||
void wpas_mbo_scan_ie(struct wpa_supplicant *wpa_s, struct wpabuf *ie);
|
||||
int wpas_mbo_supp_op_class_ie(struct wpa_supplicant *wpa_s, int freq, u8 *pos,
|
||||
size_t len);
|
||||
|
||||
/**
|
||||
* wpa_supplicant_ctrl_iface_ctrl_rsp_handle - Handle a control response
|
||||
|
|
|
|||
Loading…
Reference in a new issue