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

FT: Do not deliver RRB messages locally without matching FT/SSID

Browse source 
For FT protocol to work, the BSSs need to be operating an FT AKM with
the same SSID and mobility domain. The previous commit covered the
mobility domain, this covers the other prerequisites. This reduces
unnecessary load from having to allocate queued messages for interfaces
that cannot have valid data.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2019-12-29 20:38:40 +02:00
parent c133c785df
commit 3cd4db231a
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/ap/wpa_auth_glue.c
View file

@ -718,20 +718,26 @@ static int hostapd_wpa_auth_oui_iter(struct hostapd_iface *iface, void *ctx)
{
struct wpa_auth_oui_iface_iter_data *idata = ctx;
struct oui_deliver_later_data *data;
struct hostapd_data *hapd;
struct hostapd_data *hapd, *src_hapd = idata->src_hapd;
size_t j;
for (j = 0; j < iface->num_bss; j++) {
hapd = iface->bss[j];
if (hapd == idata->src_hapd)
continue;
if (os_memcmp(hapd->conf->mobility_domain,
idata->src_hapd->conf->mobility_domain,
if (hapd == src_hapd)
continue; /* don't deliver back to same interface */
if (!wpa_key_mgmt_ft(hapd->conf->wpa_key_mgmt) ||
hapd->conf->ssid.ssid_len !=
src_hapd->conf->ssid.ssid_len ||
os_memcmp(hapd->conf->ssid.ssid,
src_hapd->conf->ssid.ssid,
hapd->conf->ssid.ssid_len) != 0 ||
os_memcmp(hapd->conf->mobility_domain,
src_hapd->conf->mobility_domain,
MOBILITY_DOMAIN_ID_LEN) != 0)
continue;
continue; /* no matching FT SSID/mobility domain */
if (!is_multicast_ether_addr(idata->dst_addr) &&
os_memcmp(hapd->own_addr, idata->dst_addr, ETH_ALEN) != 0)
continue;
continue; /* destination address does not match */
/* defer eth_p_oui_deliver until next eloop step as this is
* when it would be triggerd from reading from sock
@ -746,11 +752,11 @@ static int hostapd_wpa_auth_oui_iter(struct hostapd_iface *iface, void *ctx)
wpa_printf(MSG_DEBUG,
"RRB(%s): local delivery to %s dst=" MACSTR
" oui_suffix=%u data_len=%u data=%p",
idata->src_hapd->conf->iface, hapd->conf->iface,
src_hapd->conf->iface, hapd->conf->iface,
MAC2STR(idata->dst_addr), idata->oui_suffix,
(unsigned int) idata->data_len, data);
os_memcpy(data->src_addr, idata->src_hapd->own_addr, ETH_ALEN);
os_memcpy(data->src_addr, src_hapd->own_addr, ETH_ALEN);
os_memcpy(data->dst_addr, idata->dst_addr, ETH_ALEN);
os_memcpy(data + 1, idata->data, idata->data_len);
data->data_len = idata->data_len;