From 08bdf4f90de61a84ed8f4dd918272dd9d36e2e1f Mon Sep 17 00:00:00 2001 From: David Bauer Date: Wed, 6 Oct 2021 02:21:05 +0200 Subject: [PATCH] proxyarp: Fix compilation with Hotspot 2.0 disabled The disable_dgaf config field is only available in case hostapd is compiled with Hotspot 2.0 support (CONFIG_HS20=y), however Proxy-ARP (CONFIG_PROXYARP=y) does not depend on Hotspot 2.0. Only add the code related to this config field when Hotspot 2.0 is enabled to fix compilation with the aformentioned preconditions. Signed-off-by: David Bauer --- src/ap/dhcp_snoop.c | 2 ++ src/ap/ndisc_snoop.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/ap/dhcp_snoop.c b/src/ap/dhcp_snoop.c index edc77da2e..551936b8e 100644 --- a/src/ap/dhcp_snoop.c +++ b/src/ap/dhcp_snoop.c @@ -88,6 +88,7 @@ static void handle_dhcp(void *ctx, const u8 *src_addr, const u8 *buf, } } +#ifdef CONFIG_HS20 if (hapd->conf->disable_dgaf && is_broadcast_ether_addr(buf)) { for (sta = hapd->sta_list; sta; sta = sta->next) { if (!(sta->flags & WLAN_STA_AUTHORIZED)) @@ -96,6 +97,7 @@ static void handle_dhcp(void *ctx, const u8 *src_addr, const u8 *buf, (u8 *) buf, len); } } +#endif /* CONFIG_HS20 */ if (msgtype == DHCPACK) { if (b->your_ip == 0) diff --git a/src/ap/ndisc_snoop.c b/src/ap/ndisc_snoop.c index 4d6a92e08..788c12fdc 100644 --- a/src/ap/ndisc_snoop.c +++ b/src/ap/ndisc_snoop.c @@ -150,10 +150,12 @@ static void handle_ndisc(void *ctx, const u8 *src_addr, const u8 *buf, return; } break; +#ifdef CONFIG_HS20 case ROUTER_ADVERTISEMENT: if (hapd->conf->disable_dgaf) ucast_to_stas(hapd, buf, len); break; +#endif /* CONFIG_HS20 */ case NEIGHBOR_ADVERTISEMENT: if (hapd->conf->na_mcast_to_ucast) ucast_to_stas(hapd, buf, len);