From: Andrew Pope <andrew.pope@xxxxxxxxxxxxxx>
Global events originating/directed toward a bridged (i.e. WDS) station are ignored by HostAP. These events are currently considered 'foreign' and are dropped.
This problem was initially discovered while testing the configuration parameter 'disassoc_low_ack=1' for bridged stations. It was observed that the event 'STATION_LOW_ACK', communicated in 'NL80211_CMD_NOTIFY_CQM', would be ignored and the AP would fail to disassociate the low ack station from the BSS.
Signed-off-by: Andrew Pope <andrew.pope@xxxxxxxxxxxxxx>
---
src/drivers/driver_nl80211.c | 13 +++++--------
src/drivers/driver_nl80211.h | 2 ++
src/drivers/driver_nl80211_event.c | 2 ++
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 2f8ed7428..181b84dff 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -182,9 +182,6 @@ static void add_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
int ifidx_reason);
static void del_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
int ifidx_reason);
-static int have_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
- int ifidx_reason);
-
static int nl80211_set_channel(struct i802_bss *bss,
struct hostapd_freq_params *freq, int set_chan);
static int nl80211_disable_11b_rates(struct wpa_driver_nl80211_data *drv,
@@ -1259,7 +1256,7 @@ nl80211_find_drv(struct nl80211_global *global, int idx, u8 *buf, size_t len,
*init_failed = 1;
return drv;
}
- if (res > 0 || have_ifidx(drv, idx, IFIDX_ANY))
+ if (res > 0 || nl80211_has_ifidx(drv, idx, IFIDX_ANY))
return drv;
}
return NULL;
@@ -8520,7 +8517,7 @@ static void add_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
wpa_printf(MSG_DEBUG,
"nl80211: Add own interface ifindex %d (ifidx_reason %d)",
ifidx, ifidx_reason);
- if (have_ifidx(drv, ifidx, ifidx_reason)) {
+ if (nl80211_has_ifidx(drv, ifidx, ifidx_reason)) {
wpa_printf(MSG_DEBUG, "nl80211: ifindex %d already in the list",
ifidx);
return;
@@ -8580,8 +8577,8 @@ static void del_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
}
-static int have_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
- int ifidx_reason)
+int nl80211_has_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
+ int ifidx_reason)
{
int i;
@@ -8687,7 +8684,7 @@ static void handle_eapol(int sock, void *eloop_ctx, void *sock_ctx)
return;
}
- if (have_ifidx(drv, lladdr.sll_ifindex, IFIDX_ANY)) {
+ if (nl80211_has_ifidx(drv, lladdr.sll_ifindex, IFIDX_ANY)) {
for (bss = drv->first_bss; bss; bss = bss->next)
drv_event_eapol_rx(bss->ctx, lladdr.sll_addr, buf, len);
}
diff --git a/src/drivers/driver_nl80211.h b/src/drivers/driver_nl80211.h
index bea87afeb..39f29c94c 100644
--- a/src/drivers/driver_nl80211.h
+++ b/src/drivers/driver_nl80211.h
@@ -370,6 +370,8 @@ struct i802_link * nl80211_get_link(struct i802_bss *bss, s8 link_id);
u8 nl80211_get_link_id_from_link(struct i802_bss *bss, struct i802_link *link);
int nl80211_remove_link(struct i802_bss *bss, int link_id);
void nl80211_update_active_links(struct i802_bss *bss, int link_id);
+int nl80211_has_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx,
+ int ifidx_reason);
static inline bool nl80211_link_valid(u16 links, s8 link_id)
{
diff --git a/src/drivers/driver_nl80211_event.c b/src/drivers/driver_nl80211_event.c
index e7b67371a..1b5ca84f1 100644
--- a/src/drivers/driver_nl80211_event.c
+++ b/src/drivers/driver_nl80211_event.c
@@ -4329,6 +4329,8 @@ int process_global_event(struct nl_msg *msg, void *arg)
wiphy_idx = nl80211_get_wiphy_index(bss);
if ((ifidx == -1 && !wiphy_idx_set && !wdev_id_set) ||
ifidx == bss->ifindex ||
+ (bss->br_ifindex > 0 &&
+ nl80211_has_ifidx(drv, bss->br_ifindex, ifidx)) ||
(wiphy_idx_set && wiphy_idx == wiphy_idx_rx) ||
(wdev_id_set && bss->wdev_id_set &&
wdev_id == bss->wdev_id)) {
--
2.34.1
_______________________________________________
Hostap mailing list
Hostap@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/hostap
