X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/546558eabd81cfc36a81a4df728fdfea0d83b41a..c39d40a767a1ae36171e5bcbf6f157ff3e80fb6c:/print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index ab279876..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"
@@ -45,73 +43,73 @@ 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 = EXTRACT_U_1(dp->ip6r_len);
-	ND_PRINT("srcrt (len=%u", len);	/*)*/
-	type = EXTRACT_U_1(dp->ip6r_type);
+	len = GET_U_1(dp->ip6r_len);
+	ND_PRINT(" (len=%u", len);	/*)*/
+	type = GET_U_1(dp->ip6r_type);
 	ND_PRINT(", type=%u", type);
-	ND_PRINT(", segleft=%u", EXTRACT_U_1(dp->ip6r_segleft));
+	if (type == IPV6_RTHDR_TYPE_0)
+		ND_PRINT(" [Deprecated]");
+	ND_PRINT(", segleft=%u", GET_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_4(dp0->ip6r0_reserved);
-		if (EXTRACT_BE_U_4(dp0->ip6r0_reserved) || ndo->ndo_vflag) {
+		if (GET_BE_U_4(dp0->ip6r0_reserved) || ndo->ndo_vflag) {
 			ND_PRINT(", rsv=0x%0x",
-			    EXTRACT_BE_U_4(dp0->ip6r0_reserved));
+			    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++) {
-			ND_TCHECK_16(p);
-			ND_PRINT(", [%u]%s", i, ip6addr_string(ndo, p));
+			ND_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p));
 			p += 16;
 		}
 		/*(*/
 		ND_PRINT(") ");
-		return((EXTRACT_U_1(dp0->ip6r0_len) + 1) << 3);
+		return((GET_U_1(dp0->ip6r0_len) + 1) << 3);
 		break;
 	case IPV6_RTHDR_TYPE_4:
 		srh = (const struct ip6_srh *)dp;
-		ND_TCHECK_1(srh->srh_last_ent);
-		ND_PRINT(", last-entry=%u", EXTRACT_U_1(srh->srh_last_ent));
+		ND_PRINT(", last-entry=%u", GET_U_1(srh->srh_last_ent));
 
-		ND_TCHECK_1(srh->srh_flags);
-		if (EXTRACT_U_1(srh->srh_flags) || ndo->ndo_vflag) {
+		if (GET_U_1(srh->srh_flags) || ndo->ndo_vflag) {
 			ND_PRINT(", flags=0x%0x",
-				EXTRACT_U_1(srh->srh_flags));
+				GET_U_1(srh->srh_flags));
 		}
 
-		ND_TCHECK_2(srh->srh_tag);
-		ND_PRINT(", tag=%x", EXTRACT_BE_U_2(srh->srh_tag));
+		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, ip6addr_string(ndo, p));
+			ND_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p));
 			p += 16;
 		}
 		/*(*/
 		ND_PRINT(") ");
-		return((EXTRACT_U_1(srh->srh_len) + 1) << 3);
+		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;
 }