From: Roy Marples <roy@marples.name>
Date: Wed, 1 Apr 2020 08:16:47 +0000 (+0100)
Subject: ND: Check matching iface to make stale and add commentary
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dba2f9f8e8acea671a72b5520ce74e6fbc8ae8a;p=thirdparty%2Fdhcpcd.git

ND: Check matching iface to make stale and add commentary
---

diff --git a/src/ipv6nd.c b/src/ipv6nd.c
index 81a80550..0089b269 100644
--- a/src/ipv6nd.c
+++ b/src/ipv6nd.c
@@ -1395,8 +1395,10 @@ ipv6nd_handlera(struct dhcpcd_ctx *ctx,
 		if (!(ia->flags & IPV6_AF_STALE) || ia->prefix_pltime == 0)
 			continue;
 		TAILQ_FOREACH(rap2, ctx->ra_routers, next) {
-			if (rap2->expired)
+			if (rap2->iface != rap->iface || rap2->expired)
 				continue;
+			/* Other routers may have zeroed the address so it
+			 * won't be stale for them. */
 			TAILQ_FOREACH(ia2, &rap2->addrs, next) {
 				if (IN6_ARE_ADDR_EQUAL(&ia->prefix,
 				    &ia2->prefix) &&