From: Roy Marples <roy@marples.name>
Date: Thu, 16 May 2013 16:29:54 +0000 (+0000)
Subject: Set scope_id correctly.
X-Git-Tag: v5.99.7~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22f64b55742b02af5b8ec09c0a4d1b601275cfb0;p=thirdparty%2Fdhcpcd.git

Set scope_id correctly.
---

diff --git a/ipv6.h b/ipv6.h
index d730c78a..1c019194 100644
--- a/ipv6.h
+++ b/ipv6.h
@@ -28,6 +28,7 @@
 #ifndef IPV6_H
 #define IPV6_H
 
+#include <sys/param.h>
 #include <sys/queue.h>
 
 #include <netinet/in.h>
diff --git a/ipv6ns.c b/ipv6ns.c
index 3221b158..5a182f82 100644
--- a/ipv6ns.c
+++ b/ipv6ns.c
@@ -298,7 +298,7 @@ ipv6ns_probeaddr(void *arg)
 	dst.sin6_addr.s6_addr[12] = 0xff;
 
 	//memcpy(&dst.sin6_addr, &ap->addr, sizeof(dst.sin6_addr));
-	//dst.sin6_scope_id = ap->iface->index;
+	dst.sin6_scope_id = ap->iface->index;
 
 	sndhdr.msg_name = (caddr_t)&dst;
 	sndhdr.msg_iov[0].iov_base = ap->ns;
@@ -422,7 +422,7 @@ ipv6ns_proberouter(void *arg)
 	dst.sin6_len = sizeof(dst);
 #endif
 	memcpy(&dst.sin6_addr, &rap->from, sizeof(dst.sin6_addr));
-	//dst.sin6_scope_id = rap->iface->index;
+	dst.sin6_scope_id = rap->iface->index;
 
 	sndhdr.msg_name = (caddr_t)&dst;
 	sndhdr.msg_iov[0].iov_base = rap->ns;
diff --git a/ipv6rs.c b/ipv6rs.c
index 4dd37b36..ca69fe2a 100644
--- a/ipv6rs.c
+++ b/ipv6rs.c
@@ -233,7 +233,7 @@ ipv6rs_sendprobe(void *arg)
 	int hoplimit = HOPLIMIT;
 
 	dst = allrouters;
-	//dst.sin6_scope_id = ifp->linkid;
+	dst.sin6_scope_id = ifp->index;
 
 	state = RS_STATE(ifp);
 	sndhdr.msg_name = (caddr_t)&dst;