Linux: IP6 forwaring only applies to "all" interface

Per interface forwarding is apparently only for setting things
like IsRouter in NA messages.

1 files changed, 7 insertions, 18 deletions

diff --git a/src/ipv6.c b/src/ipv6.c
index c42b3d6d..5a8b08be 100644
--- a/src/ipv6.c
+++ b/src/ipv6.c
@@ -1092,33 +1092,22 @@ ipv6_anyglobal(struct interface *sifp)
 	struct interface *ifp;
 	struct ipv6_state *state;
 	struct ipv6_addr *ia;
-#ifdef BSD
 	bool forwarding;
 
-#if defined(PRIVSEP) && defined(HAVE_PLEDGE)
+	/* BSD forwarding is either on or off.
+	 * Linux forwarding is technically the same as it's
+	 * configured by the "all" interface.
+	 * Per interface only affects IsRouter of NA messages. */
+#if defined(PRIVSEP) && (defined(HAVE_PLEDGE) || defined(__linux__))
 	if (IN_PRIVSEP(sifp->ctx))
-		forwarding = ps_root_ip6forwarding(sifp->ctx, NULL) == 1;
+		forwarding = ps_root_ip6forwarding(sifp->ctx, "all") != 0;
 	else
 #endif
-		forwarding = ip6_forwarding(NULL) == 1;
-#endif
-
+		forwarding = ip6_forwarding("all") != 0;
 
 	TAILQ_FOREACH(ifp, sifp->ctx->ifaces, next) {
-#ifdef BSD
 		if (ifp != sifp && !forwarding)
 			continue;
-#else
-#if defined(PRIVSEP) && defined(__linux__)
-	if (IN_PRIVSEP(sifp->ctx)) {
-		if (ifp != sifp &&
-		    ps_root_ip6forwarding(sifp->ctx, ifp->name) != 1)
-			continue;
-	} else
-#endif
-		if (ifp != sifp && ip6_forwarding(ifp->name) != 1)
-			continue;
-#endif
 
 		state = IPV6_STATE(ifp);
 		if (state == NULL)