We update fwd_guest_accessible4() and fwd_guest_accessible6() to check
against all addresses in the addrs[] array, not just addrs[0].
This ensures that when multiple addresses are configured via -a options,
traffic using any of them is correctly identified as guest traffic for
NAT and forwarding decisions.
Signed-off-by: Jon Maloy
---
fwd.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/fwd.c b/fwd.c
index 408af30..ece381d 100644
--- a/fwd.c
+++ b/fwd.c
@@ -502,6 +502,8 @@ static bool is_dns_flow(uint8_t proto, const struct flowside *ini)
static bool fwd_guest_accessible4(const struct ctx *c,
const struct in_addr *addr)
{
+ int i;
+
if (IN4_IS_ADDR_LOOPBACK(addr))
return false;
@@ -513,11 +515,15 @@ static bool fwd_guest_accessible4(const struct ctx *c,
if (IN4_IS_ADDR_UNSPECIFIED(addr))
return false;
- /* For IPv4, addr_seen is initialised to addr, so is always a valid
- * address
+ /* Check against all configured guest addresses */
+ for (i = 0; i < c->ip4.addr_count; i++)
+ if (IN4_ARE_ADDR_EQUAL(addr, &c->ip4.addrs[i].addr))
+ return false;
+
+ /* Also check addr_seen: it tracks the address the guest is actually
+ * using, which may differ from configured addresses.
*/
- if (IN4_ARE_ADDR_EQUAL(addr, &c->ip4.addrs[0].addr) ||
- IN4_ARE_ADDR_EQUAL(addr, &c->ip4.addr_seen))
+ if (IN4_ARE_ADDR_EQUAL(addr, &c->ip4.addr_seen))
return false;
return true;
@@ -534,11 +540,15 @@ static bool fwd_guest_accessible4(const struct ctx *c,
static bool fwd_guest_accessible6(const struct ctx *c,
const struct in6_addr *addr)
{
+ int i;
+
if (IN6_IS_ADDR_LOOPBACK(addr))
return false;
- if (IN6_ARE_ADDR_EQUAL(addr, &c->ip6.addrs[0].addr))
- return false;
+ /* Check against all configured guest addresses */
+ for (i = 0; i < c->ip6.addr_count; i++)
+ if (IN6_ARE_ADDR_EQUAL(addr, &c->ip6.addrs[i].addr))
+ return false;
/* For IPv6, addr_seen starts unspecified, because we don't know what LL
* address the guest will take until we see it. Only check against it
--
2.51.1