hostapd: let netifd set bridge port attributes for snooping
Avoids race conditions on bridge member add/remove Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
parent
ef24475658
commit
17d19a7d43
@ -10,7 +10,36 @@
|
|||||||
|
|
||||||
--- a/src/ap/x_snoop.c
|
--- a/src/ap/x_snoop.c
|
||||||
+++ b/src/ap/x_snoop.c
|
+++ b/src/ap/x_snoop.c
|
||||||
@@ -71,8 +71,12 @@ x_snoop_get_l2_packet(struct hostapd_dat
|
@@ -31,14 +31,16 @@ int x_snoop_init(struct hostapd_data *ha
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE,
|
||||||
|
+ if (!conf->snoop_iface[0] &&
|
||||||
|
+ hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_HAIRPIN_MODE,
|
||||||
|
1)) {
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"x_snoop: Failed to enable hairpin_mode on the bridge port");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 1)) {
|
||||||
|
+ if (!conf->snoop_iface[0] &&
|
||||||
|
+ hostapd_drv_br_port_set_attr(hapd, DRV_BR_PORT_ATTR_PROXYARP, 1)) {
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"x_snoop: Failed to enable proxyarp on the bridge port");
|
||||||
|
return -1;
|
||||||
|
@@ -52,7 +54,8 @@ int x_snoop_init(struct hostapd_data *ha
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_IPV6
|
||||||
|
- if (hostapd_drv_br_set_net_param(hapd, DRV_BR_MULTICAST_SNOOPING, 1)) {
|
||||||
|
+ if (!conf->snoop_iface[0] &&
|
||||||
|
+ hostapd_drv_br_set_net_param(hapd, DRV_BR_MULTICAST_SNOOPING, 1)) {
|
||||||
|
wpa_printf(MSG_DEBUG,
|
||||||
|
"x_snoop: Failed to enable multicast snooping on the bridge");
|
||||||
|
return -1;
|
||||||
|
@@ -71,8 +74,12 @@ x_snoop_get_l2_packet(struct hostapd_dat
|
||||||
{
|
{
|
||||||
struct hostapd_bss_config *conf = hapd->conf;
|
struct hostapd_bss_config *conf = hapd->conf;
|
||||||
struct l2_packet_data *l2;
|
struct l2_packet_data *l2;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user