svn commit: r290366 - head/usr.bin/netstat

[Hajimu UMEMOTO]

Author: ume
Date: Wed Nov  4 14:47:10 2015
New Revision: 290366
URL: https://svnweb.freebsd.org/changeset/base/290366

Log:
  Mask an IPv6 network address.

Modified:
  head/usr.bin/netstat/route.c

Modified: head/usr.bin/netstat/route.c
==============================================================================
--- head/usr.bin/netstat/route.c	Wed Nov  4 13:59:13 2015	(r290365)
+++ head/usr.bin/netstat/route.c	Wed Nov  4 14:47:10 2015	(r290366)
@@ -688,9 +688,10 @@ static const char *
 netname6(struct sockaddr_in6 *sa6, struct sockaddr_in6 *mask)
 {
 	static char line[NI_MAXHOST + sizeof("/xxx") - 1];
+	struct sockaddr_in6 addr;
 	char nline[NI_MAXHOST];
 	u_char *p, *lim;
-	int masklen, illegal = 0;
+	int masklen, illegal = 0, i;
 
 	if (mask) {
 		p = (u_char *)&mask->sin6_addr;
@@ -703,6 +704,12 @@ netname6(struct sockaddr_in6 *sa6, struc
 		}
 		if (illegal)
 			xo_error("illegal prefixlen\n");
+
+		memcpy(&addr, sa6, sizeof(addr));
+		for (i = 0; i < 16; ++i)
+			addr.sin6_addr.s6_addr[i] &=
+			    mask->sin6_addr.s6_addr[i];
+		sa6 = &addr;
 	}
 	else
 		masklen = 128;