Attachment 160262 Details for Bug 202600 – ndp.c diff

[patch] ndp.c diff

ndp.patch (text/plain), 3.86 KB, created by Christian Weisgerber on 2015-08-23 18:51:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christian Weisgerber

Created: 2015-08-23 18:51:16 UTC

Size: 3.86 KB

patch

obsolete

>Index: usr.sbin/ndp/ndp.c
>===================================================================
>--- usr.sbin/ndp/ndp.c	(revision 287037)
>+++ usr.sbin/ndp/ndp.c	(working copy)
>@@ -1153,9 +1153,8 @@
> {
> #ifdef ICMPV6CTL_ND6_PRLIST
> 	int mib[] = { CTL_NET, PF_INET6, IPPROTO_ICMPV6, ICMPV6CTL_ND6_PRLIST };
>-	char *buf;
>-	struct in6_prefix *p, *ep, *n;
>-	struct sockaddr_in6 *advrtr;
>+	char *buf, *p, *ep;
>+	struct in6_prefix pfx;
> 	size_t l;
> 	struct timeval now;
> 	const int niflags = NI_NUMERICHOST;
>@@ -1176,17 +1175,17 @@
> 		/*NOTREACHED*/
> 	}
> 
>-	ep = (struct in6_prefix *)(buf + l);
>-	for (p = (struct in6_prefix *)buf; p < ep; p = n) {
>-		advrtr = (struct sockaddr_in6 *)(p + 1);
>-		n = (struct in6_prefix *)&advrtr[p->advrtrs];
>+	ep = buf + l;
>+	for (p = buf; p < ep; ) {
>+		memcpy(&pfx, p, sizeof(pfx));
>+		p += sizeof(pfx);
> 
>-		if (getnameinfo((struct sockaddr *)&p->prefix,
>-		    p->prefix.sin6_len, namebuf, sizeof(namebuf),
>+		if (getnameinfo((struct sockaddr *)&pfx.prefix,
>+		    pfx.prefix.sin6_len, namebuf, sizeof(namebuf),
> 		    NULL, 0, niflags) != 0)
> 			strlcpy(namebuf, "?", sizeof(namebuf));
>-		printf("%s/%d if=%s\n", namebuf, p->prefixlen,
>-		    if_indextoname(p->if_index, ifix_buf));
>+		printf("%s/%d if=%s\n", namebuf, pfx.prefixlen,
>+		    if_indextoname(pfx.if_index, ifix_buf));
> 
> 		gettimeofday(&now, 0);
> 		/*
>@@ -1194,54 +1193,56 @@
> 		 * by origin.  notify the difference to the users.
> 		 */
> 		printf("flags=%s%s%s%s%s",
>-		    p->raflags.onlink ? "L" : "",
>-		    p->raflags.autonomous ? "A" : "",
>-		    (p->flags & NDPRF_ONLINK) != 0 ? "O" : "",
>-		    (p->flags & NDPRF_DETACHED) != 0 ? "D" : "",
>+		    pfx.raflags.onlink ? "L" : "",
>+		    pfx.raflags.autonomous ? "A" : "",
>+		    (pfx.flags & NDPRF_ONLINK) != 0 ? "O" : "",
>+		    (pfx.flags & NDPRF_DETACHED) != 0 ? "D" : "",
> #ifdef NDPRF_HOME
>-		    (p->flags & NDPRF_HOME) != 0 ? "H" : ""
>+		    (pfx.flags & NDPRF_HOME) != 0 ? "H" : ""
> #else
> 		    ""
> #endif
> 		    );
>-		if (p->vltime == ND6_INFINITE_LIFETIME)
>+		if (pfx.vltime == ND6_INFINITE_LIFETIME)
> 			printf(" vltime=infinity");
> 		else
>-			printf(" vltime=%lu", (unsigned long)p->vltime);
>-		if (p->pltime == ND6_INFINITE_LIFETIME)
>+			printf(" vltime=%lu", (unsigned long)pfx.vltime);
>+		if (pfx.pltime == ND6_INFINITE_LIFETIME)
> 			printf(", pltime=infinity");
> 		else
>-			printf(", pltime=%lu", (unsigned long)p->pltime);
>-		if (p->expire == 0)
>+			printf(", pltime=%lu", (unsigned long)pfx.pltime);
>+		if (pfx.expire == 0)
> 			printf(", expire=Never");
>-		else if (p->expire >= now.tv_sec)
>+		else if (pfx.expire >= now.tv_sec)
> 			printf(", expire=%s",
>-			    sec2str(p->expire - now.tv_sec));
>+			    sec2str(pfx.expire - now.tv_sec));
> 		else
> 			printf(", expired");
>-		printf(", ref=%d", p->refcnt);
>+		printf(", ref=%d", pfx.refcnt);
> 		printf("\n");
> 		/*
> 		 * "advertising router" list is meaningful only if the prefix
> 		 * information is from RA.
> 		 */
>-		if (p->advrtrs) {
>+		if (pfx.advrtrs) {
> 			int j;
>-			struct sockaddr_in6 *sin6;
>+			struct sockaddr_in6 sin6;
> 
>-			sin6 = advrtr;
> 			printf("  advertised by\n");
>-			for (j = 0; j < p->advrtrs; j++) {
>+			for (j = 0; j < pfx.advrtrs && p <= ep; j++) {
> 				struct in6_nbrinfo *nbi;
> 
>-				if (getnameinfo((struct sockaddr *)sin6,
>-				    sin6->sin6_len, namebuf, sizeof(namebuf),
>+				memcpy(&sin6, p, sizeof(sin6));
>+				p += sizeof(sin6);
>+
>+				if (getnameinfo((struct sockaddr *)&sin6,
>+				    sin6.sin6_len, namebuf, sizeof(namebuf),
> 				    NULL, 0, ninflags) != 0)
> 					strlcpy(namebuf, "?", sizeof(namebuf));
> 				printf("    %s", namebuf);
> 
>-				nbi = getnbrinfo(&sin6->sin6_addr,
>-				    p->if_index, 0);
>+				nbi = getnbrinfo(&sin6.sin6_addr,
>+				    pfx.if_index, 0);
> 				if (nbi) {
> 					switch (nbi->state) {
> 					case ND6_LLINFO_REACHABLE:
>@@ -1255,7 +1256,6 @@
> 					}
> 				} else
> 					printf(" (no neighbor state)\n");
>-				sin6++;
> 			}
> 		} else
> 			printf("  No advertising router\n");

Actions: View | Diff

Attachments on bug 202600: 160262