From: Roy Marples <roy@marples.name>
Date: Thu, 4 Apr 2013 21:08:31 +0000 (+0000)
Subject: Quickly backport an IPv6 router expiry fix for multi-homed systems.
X-Git-Tag: v5.6.8^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c06933ca0307cac2479dede621a0dbcfefd2ba3;p=thirdparty%2Fdhcpcd.git

Quickly backport an IPv6 router expiry fix for multi-homed systems.
---

diff --git a/ipv6ns.c b/ipv6ns.c
index 8bfac4c8..00bc6dfb 100644
--- a/ipv6ns.c
+++ b/ipv6ns.c
@@ -338,7 +338,8 @@ ipv6ns_handledata(_unused void *arg)
 	}
 
 	TAILQ_FOREACH(rap, &ipv6_routers, next) {
-		if (memcmp(rap->from.s6_addr, from.sin6_addr.s6_addr,
+		if (rap->iface == ifp &&
+		    memcmp(rap->from.s6_addr, from.sin6_addr.s6_addr,
 		    sizeof(rap->from.s6_addr)) == 0)
 			break;
 	}