From: Roy Marples <roy@marples.name>
Date: Mon, 28 Jan 2013 09:47:15 +0000 (+0000)
Subject: Check the correct interface the RAP came from before overwriting it.
X-Git-Tag: v5.6.7~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90eef833b7a116ca62ac72c6a0a9e825b09eacae;p=thirdparty%2Fdhcpcd.git

Check the correct interface the RAP came from before overwriting it.
Thanks to Taylor R Campbell.
---

diff --git a/ipv6rs.c b/ipv6rs.c
index 56fe2510..e2d9a162 100644
--- a/ipv6rs.c
+++ b/ipv6rs.c
@@ -463,7 +463,8 @@ ipv6rs_handledata(_unused void *arg)
 		return;
 	}
 	TAILQ_FOREACH(rap, &ipv6_routers, next) {
-		if (memcmp(rap->from.s6_addr, from.sin6_addr.s6_addr,
+		if (ifp == rap->iface &&
+		    memcmp(rap->from.s6_addr, from.sin6_addr.s6_addr,
 		    sizeof(rap->from.s6_addr)) == 0)
 			break;
 	}