X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/abc8c2d61c65757011d9d32abb01cd1e51232f3a..0023eaa78f123676bfa9c5fba72ea4b8a59aaa70:/print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index cd875db7..6019cd79 100644
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -21,14 +21,10 @@
 
 /* \summary: IPv6 routing header printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
-#include <string.h>
-
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
@@ -45,14 +41,16 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
 	const u_char *p;
 
 	ndo->ndo_protocol = "rt6";
-	dp = (const struct ip6_rthdr *)bp;
 
-	ND_TCHECK_1(dp->ip6r_segleft);
+	nd_print_protocol_caps(ndo);
+	dp = (const struct ip6_rthdr *)bp;
 
 	len = GET_U_1(dp->ip6r_len);
-	ND_PRINT("srcrt (len=%u", len);	/*)*/
+	ND_PRINT(" (len=%u", len);	/*)*/
 	type = GET_U_1(dp->ip6r_type);
 	ND_PRINT(", type=%u", type);
+	if (type == IPV6_RTHDR_TYPE_0)
+		ND_PRINT(" [Deprecated]");
 	ND_PRINT(", segleft=%u", GET_U_1(dp->ip6r_segleft));
 
 	switch (type) {
@@ -65,12 +63,13 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
 			    GET_BE_U_4(dp0->ip6r0_reserved));
 		}
 
-		if (len % 2 == 1)
-			goto trunc;
+		if (len % 2 == 1) {
+			ND_PRINT(" [length %u]", len);
+			goto invalid;
+		}
 		len >>= 1;
 		p = (const u_char *) dp0->ip6r0_addr;
 		for (i = 0; i < len; i++) {
-			ND_TCHECK_16(p);
 			ND_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p));
 			p += 16;
 		}
@@ -89,12 +88,13 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
 
 		ND_PRINT(", tag=%x", GET_BE_U_2(srh->srh_tag));
 
-		if (len % 2 == 1)
-			goto trunc;
+		if (len % 2 == 1) {
+			ND_PRINT(" (invalid length %u)", len);
+			goto invalid;
+		}
 		len >>= 1;
 		p  = (const u_char *) srh->srh_segments;
 		for (i = 0; i < len; i++) {
-			ND_TCHECK_16(p);
 			ND_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p));
 			p += 16;
 		}
@@ -103,11 +103,11 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
 		return((GET_U_1(srh->srh_len) + 1) << 3);
 		break;
 	default:
-		goto trunc;
-		break;
+		ND_PRINT(" (unknown type)");
+		goto invalid;
 	}
 
- trunc:
-	ND_PRINT("[|srcrt]");
+invalid:
+	nd_print_invalid(ndo);
 	return -1;
 }