| --- a/src/ap/ap_config.h |
| +++ b/src/ap/ap_config.h |
| @@ -284,6 +284,7 @@ struct hostapd_bss_config { |
| char iface[IFNAMSIZ + 1]; |
| char bridge[IFNAMSIZ + 1]; |
| char ft_iface[IFNAMSIZ + 1]; |
| + char snoop_iface[IFNAMSIZ + 1]; |
| char vlan_bridge[IFNAMSIZ + 1]; |
| char wds_bridge[IFNAMSIZ + 1]; |
| int bridge_hairpin; /* hairpin_mode on bridge members */ |
| --- a/src/ap/x_snoop.c |
| +++ b/src/ap/x_snoop.c |
| @@ -33,14 +33,16 @@ int x_snoop_init(struct hostapd_data *ha |
| |
| hapd->x_snoop_initialized = true; |
| |
| - 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; |
| @@ -54,7 +56,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; |
| @@ -73,8 +76,12 @@ x_snoop_get_l2_packet(struct hostapd_dat |
| { |
| struct hostapd_bss_config *conf = hapd->conf; |
| struct l2_packet_data *l2; |
| + const char *ifname = conf->bridge; |
| |
| - l2 = l2_packet_init(conf->bridge, NULL, ETH_P_ALL, handler, hapd, 1); |
| + if (conf->snoop_iface[0]) |
| + ifname = conf->snoop_iface; |
| + |
| + l2 = l2_packet_init(ifname, NULL, ETH_P_ALL, handler, hapd, 1); |
| if (l2 == NULL) { |
| wpa_printf(MSG_DEBUG, |
| "x_snoop: Failed to initialize L2 packet processing %s", |
| --- a/hostapd/config_file.c |
| +++ b/hostapd/config_file.c |
| @@ -2320,6 +2320,8 @@ static int hostapd_config_fill(struct ho |
| os_strlcpy(bss->wds_bridge, pos, sizeof(bss->wds_bridge)); |
| } else if (os_strcmp(buf, "bridge_hairpin") == 0) { |
| bss->bridge_hairpin = atoi(pos); |
| + } else if (os_strcmp(buf, "snoop_iface") == 0) { |
| + os_strlcpy(bss->snoop_iface, pos, sizeof(bss->snoop_iface)); |
| } else if (os_strcmp(buf, "vlan_bridge") == 0) { |
| os_strlcpy(bss->vlan_bridge, pos, sizeof(bss->vlan_bridge)); |
| } else if (os_strcmp(buf, "wds_bridge") == 0) { |