X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/32e24ead3b2a171e5f5eff50d7231c2514eda9b4..94366a69b0ea80c2e85aa89f7b7f30d7f335bd76:/print-frag6.c

diff --git a/print-frag6.c b/print-frag6.c
index 618e93bb..0ac2fd7f 100644
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -42,30 +42,24 @@ frag6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2)
 	dp = (const struct ip6_frag *)bp;
 	ip6 = (const struct ip6_hdr *)bp2;
 
-	ND_TCHECK_SIZE(dp);
-
 	if (ndo->ndo_vflag) {
-		ND_PRINT("frag (0x%08x:%u|%u)",
-		       EXTRACT_BE_U_4(dp->ip6f_ident),
-		       EXTRACT_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK,
-		       (u_int)(sizeof(struct ip6_hdr) + EXTRACT_BE_U_2(ip6->ip6_plen) -
-		         (bp - bp2) - sizeof(struct ip6_frag)));
+		ND_PRINT("frag (0x%08x:%u|%zu)",
+			 GET_BE_U_4(dp->ip6f_ident),
+			 GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK,
+			 sizeof(struct ip6_hdr) + GET_BE_U_2(ip6->ip6_plen) -
+			        (bp - bp2) - sizeof(struct ip6_frag));
 	} else {
-		ND_PRINT("frag (%u|%u)",
-		       EXTRACT_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK,
-		       (u_int)(sizeof(struct ip6_hdr) + EXTRACT_BE_U_2(ip6->ip6_plen) -
-		         (bp - bp2) - sizeof(struct ip6_frag)));
+		ND_PRINT("frag (%u|%zu)",
+		         GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK,
+		         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
-	{
+	else {
 		ND_PRINT(" ");
 		return sizeof(struct ip6_frag);
 	}
-trunc:
-	nd_print_trunc(ndo);
-	return -1;
 }