CVS commit: src/usr.sbin/ndp

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Mon Dec 14 18:24:06 UTC 2015

Modified Files:
        src/usr.sbin/ndp: ndp.c

Log Message:
Don't forget to set sin_scope. From Ryota Ozaki


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/usr.sbin/ndp/ndp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.sbin/ndp/ndp.c
diff -u src/usr.sbin/ndp/ndp.c:1.45 src/usr.sbin/ndp/ndp.c:1.46
--- src/usr.sbin/ndp/ndp.c:1.45	Mon Aug  3 05:51:40 2015
+++ src/usr.sbin/ndp/ndp.c	Mon Dec 14 13:24:06 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ndp.c,v 1.45 2015/08/03 09:51:40 ozaki-r Exp $	*/
+/*	$NetBSD: ndp.c,v 1.46 2015/12/14 18:24:06 christos Exp $	*/
 /*	$KAME: ndp.c,v 1.121 2005/07/13 11:30:13 keiichi Exp $	*/
 
 /*
@@ -304,6 +304,15 @@ main(int argc, char **argv)
 }
 
 static void
+makeaddr(struct sockaddr_in6 *mysin, const void *resp)
+{
+	const struct sockaddr_in6 *res = resp;
+	mysin->sin6_addr = res->sin6_addr;
+	mysin->sin6_scope_id = res->sin6_scope_id;
+	inet6_putscopeid(mysin, INET6_IS_ADDR_LINKLOCAL);
+}
+
+static void
 getsocket(void)
 {
 	if (my_s < 0) {
@@ -362,8 +371,7 @@ set(int argc, char **argv)
 		warnx("%s: %s", host, gai_strerror(gai_error));
 		return 1;
 	}
-	mysin->sin6_addr = ((struct sockaddr_in6 *)(void *)res->ai_addr)->sin6_addr;
-	inet6_putscopeid(mysin, INET6_IS_ADDR_LINKLOCAL);
+	makeaddr(mysin, res->ai_addr);
 	ea = (u_char *)LLADDR(&sdl_m);
 	if (ndp_ether_aton(eaddr, ea) == 0)
 		sdl_m.sdl_alen = 6;
@@ -429,8 +437,7 @@ get(char *host)
 		warnx("%s: %s", host, gai_strerror(gai_error));
 		return;
 	}
-	mysin->sin6_addr = ((struct sockaddr_in6 *)(void *)res->ai_addr)->sin6_addr;
-	inet6_putscopeid(mysin, INET6_IS_ADDR_LINKLOCAL);
+	makeaddr(mysin, res->ai_addr);
 	dump(&mysin->sin6_addr, 0);
 	if (found_entry == 0) {
 		(void)getnameinfo((struct sockaddr *)(void *)mysin,
@@ -463,8 +470,7 @@ delete(char *host)
 		warnx("%s: %s", host, gai_strerror(gai_error));
 		return 1;
 	}
-	mysin->sin6_addr = ((struct sockaddr_in6 *)(void *)res->ai_addr)->sin6_addr;
-	inet6_putscopeid(mysin, INET6_IS_ADDR_LINKLOCAL);
+	makeaddr(mysin, res->ai_addr);
 	if (rtmsg(RTM_GET) < 0)
 		errx(1, "RTM_GET(%s) failed", host);
 	mysin = (struct sockaddr_in6 *)(void *)(rtm + 1);