X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/6ec714988caac3bf9fedc766ae51a2248896ec80..HEAD:/print-frag6.c

diff --git a/print-frag6.c b/print-frag6.c
index f1728f0c..abc2a636 100644
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -21,12 +21,11 @@
 
 /* \summary: IPv6 fragmentation header printer */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 
@@ -38,33 +37,29 @@ frag6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2)
 	const struct ip6_frag *dp;
 	const struct ip6_hdr *ip6;
 
+	ndo->ndo_protocol = "frag6";
 	dp = (const struct ip6_frag *)bp;
 	ip6 = (const struct ip6_hdr *)bp2;
 
-	ND_TCHECK(*dp);
-
-	if (ndo->ndo_vflag) {
-		ND_PRINT((ndo, "frag (0x%08x:%d|%ld)",
-		       EXTRACT_BE_U_4(&dp->ip6f_ident),
-		       EXTRACT_BE_U_2(&dp->ip6f_offlg) & IP6F_OFF_MASK,
-		       sizeof(struct ip6_hdr) + EXTRACT_BE_U_2(&ip6->ip6_plen) -
-		       (long)(bp - bp2) - sizeof(struct ip6_frag)));
-	} else {
-		ND_PRINT((ndo, "frag (%d|%ld)",
-		       EXTRACT_BE_U_2(&dp->ip6f_offlg) & IP6F_OFF_MASK,
-		       sizeof(struct ip6_hdr) + EXTRACT_BE_U_2(&ip6->ip6_plen) -
-		       (long)(bp - bp2) - sizeof(struct ip6_frag)));
-	}
+	ND_PRINT("frag (");
+	if (ndo->ndo_vflag)
+		ND_PRINT("0x%08x:", GET_BE_U_4(dp->ip6f_ident));
+	else
+		ND_TCHECK_4(dp->ip6f_ident);
+	ND_PRINT("%u|", GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK);
+	if ((bp - bp2) + sizeof(struct ip6_frag) >
+	    sizeof(struct ip6_hdr) + GET_BE_U_2(ip6->ip6_plen))
+		ND_PRINT("[length < 0] (invalid))");
+	else
+		ND_PRINT("%zu)",
+			 sizeof(struct ip6_hdr) + GET_BE_U_2(ip6->ip6_plen) -
+			 (bp - bp2) - sizeof(struct ip6_frag));
 
 	/* it is meaningless to decode non-first fragment */
-	if ((EXTRACT_BE_U_2(&dp->ip6f_offlg) & IP6F_OFF_MASK) != 0)
+	if ((GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK) != 0)
 		return -1;
-	else
-	{
-		ND_PRINT((ndo, " "));
+	else {
+		ND_PRINT(" ");
 		return sizeof(struct ip6_frag);
 	}
-trunc:
-	ND_PRINT((ndo, "[|frag]"));
-	return -1;
 }