X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/8a776c2410fb4ff349d982fcf187924351c4b9b0..refs/pull/1034/head:/print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index a83ea379..096a9628 100644
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -27,8 +27,6 @@
 
 #include "netdissect-stdinc.h"
 
-#include <string.h>
-
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
@@ -49,12 +47,12 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
 	nd_print_protocol_caps(ndo);
 	dp = (const struct ip6_rthdr *)bp;
 
-	ND_TCHECK_1(dp->ip6r_segleft);
-
 	len = GET_U_1(dp->ip6r_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) {
@@ -67,8 +65,10 @@ 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(" (invalid length %u)", len);
+			goto invalid;
+		}
 		len >>= 1;
 		p = (const u_char *) dp0->ip6r0_addr;
 		for (i = 0; i < len; i++) {
@@ -90,8 +90,10 @@ 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++) {
@@ -103,11 +105,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_trunc(ndo);
+invalid:
+	nd_print_invalid(ndo);
 	return -1;
 }