X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/aa37262ac40d0a26f1607f0f79202c5685605aa0..8030a66cdcbf81c88cbb7c38ef7a334e9f1941cd:/print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index af74fa0a..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,74 +41,69 @@ 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(dp->ip6r_segleft);
+	ND_TCHECK_1(dp->ip6r_segleft);
 
 	len = EXTRACT_U_1(dp->ip6r_len);
-	ND_PRINT((ndo, "srcrt (len=%u", len));	/*)*/
+	ND_PRINT("srcrt (len=%u", len);	/*)*/
 	type = EXTRACT_U_1(dp->ip6r_type);
-	ND_PRINT((ndo, ", type=%u", type));
-	ND_PRINT((ndo, ", segleft=%u", EXTRACT_U_1(dp->ip6r_segleft)));
+	ND_PRINT(", type=%u", type);
+	ND_PRINT(", segleft=%u", EXTRACT_U_1(dp->ip6r_segleft));
 
 	switch (type) {
 	case IPV6_RTHDR_TYPE_0:
 	case IPV6_RTHDR_TYPE_2:			/* Mobile IPv6 ID-20 */
 		dp0 = (const struct ip6_rthdr0 *)dp;
 
-		ND_TCHECK(dp0->ip6r0_reserved);
+		ND_TCHECK_4(dp0->ip6r0_reserved);
 		if (EXTRACT_BE_U_4(dp0->ip6r0_reserved) || ndo->ndo_vflag) {
-			ND_PRINT((ndo, ", rsv=0x%0x",
-			    EXTRACT_BE_U_4(dp0->ip6r0_reserved)));
+			ND_PRINT(", rsv=0x%0x",
+			    EXTRACT_BE_U_4(dp0->ip6r0_reserved));
 		}
 
 		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((ndo, ", [%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((ndo, ") "));
+		ND_PRINT(") ");
 		return((EXTRACT_U_1(dp0->ip6r0_len) + 1) << 3);
 		break;
 	case IPV6_RTHDR_TYPE_4:
 		srh = (const struct ip6_srh *)dp;
-		ND_PRINT((ndo, ", last-entry=%u", EXTRACT_U_1(srh->srh_last_ent)));
+		ND_TCHECK_1(srh->srh_last_ent);
+		ND_PRINT(", last-entry=%u", EXTRACT_U_1(srh->srh_last_ent));
 
-		ND_TCHECK(srh->srh_flags);
+		ND_TCHECK_1(srh->srh_flags);
 		if (EXTRACT_U_1(srh->srh_flags) || ndo->ndo_vflag) {
-			ND_PRINT((ndo, ", flags=0x%0x",
-				EXTRACT_U_1(srh->srh_flags)));
+			ND_PRINT(", flags=0x%0x",
+				EXTRACT_U_1(srh->srh_flags));
 		}
 
-		ND_PRINT((ndo, ", tag=%x", EXTRACT_BE_U_2(srh->srh_tag)));
+		ND_TCHECK_2(srh->srh_tag);
+		ND_PRINT(", tag=%x", EXTRACT_BE_U_2(srh->srh_tag));
 
 		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((ndo, ", [%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((ndo, ") "));
+		ND_PRINT(") ");
 		return((EXTRACT_U_1(srh->srh_len) + 1) << 3);
 		break;
 	default:
@@ -117,6 +112,6 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
 	}
 
  trunc:
-	ND_PRINT((ndo, "[|srcrt]"));
+	ND_PRINT("[|srcrt]");
 	return -1;
 }