X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/245fa1930887fad19b213d1bb0b95ab739ea18d0..a8abce5c5e2dce2ba6dbccd5d3829da104b80f9c:/print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index 684eac40..ab279876 100644
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -22,10 +22,10 @@
 /* \summary: IPv6 routing header printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <string.h>
 
@@ -41,15 +41,12 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
 	const struct ip6_rthdr *dp;
 	const struct ip6_rthdr0 *dp0;
 	const struct ip6_srh *srh;
-	const u_char *ep;
 	u_int i, len, type;
-	const struct in6_addr *addr;
+	const u_char *p;
 
+	ndo->ndo_protocol = "rt6";
 	dp = (const struct ip6_rthdr *)bp;
 
-	/* 'ep' points to the end of available data. */
-	ep = ndo->ndo_snapend;
-
 	ND_TCHECK_1(dp->ip6r_segleft);
 
 	len = EXTRACT_U_1(dp->ip6r_len);
@@ -72,13 +69,11 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
 		if (len % 2 == 1)
 			goto trunc;
 		len >>= 1;
-		addr = &dp0->ip6r0_addr[0];
+		p = (const u_char *) dp0->ip6r0_addr;
 		for (i = 0; i < len; i++) {
-			if ((const u_char *)(addr + 1) > ep)
-				goto trunc;
-
-			ND_PRINT(", [%d]%s", i, ip6addr_string(ndo, addr));
-			addr++;
+			ND_TCHECK_16(p);
+			ND_PRINT(", [%u]%s", i, ip6addr_string(ndo, p));
+			p += 16;
 		}
 		/*(*/
 		ND_PRINT(") ");
@@ -101,13 +96,11 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
 		if (len % 2 == 1)
 			goto trunc;
 		len >>= 1;
-		addr = &srh->srh_segments[0];
+		p  = (const u_char *) srh->srh_segments;
 		for (i = 0; i < len; i++) {
-			if ((const u_char *)(addr + 1) > ep)
-				goto trunc;
-
-			ND_PRINT(", [%d]%s", i, ip6addr_string(ndo, addr));
-			addr++;
+			ND_TCHECK_16(p);
+			ND_PRINT(", [%u]%s", i, ip6addr_string(ndo, p));
+			p += 16;
 		}
 		/*(*/
 		ND_PRINT(") ");