X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/1fe6e66ecec3fb7a7cc729038012cbb264542331..5ef0bcb5edd748de9d9af13c40da0395dfdd94e8:/print-frag6.c

diff --git a/print-frag6.c b/print-frag6.c
index 12909528..818cce2a 100644
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -19,53 +19,53 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: IPv6 fragmentation header printer */
+
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#ifdef INET6
+#include "netdissect-stdinc.h"
 
-#include <tcpdump-stdinc.h>
+#include "netdissect.h"
+#include "extract.h"
 
 #include "ip6.h"
-#include "interface.h"
-#include "extract.h"
 
 int
-frag6_print(netdissect_options *ndo, register const u_char *bp, register const u_char *bp2)
+frag6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2)
 {
-	register const struct ip6_frag *dp;
-	register const struct ip6_hdr *ip6;
+	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->ip6f_offlg);
+	ND_TCHECK_SIZE(dp);
 
 	if (ndo->ndo_vflag) {
-		ND_PRINT((ndo, "frag (0x%08x:%d|%ld)",
-		       EXTRACT_32BITS(&dp->ip6f_ident),
-		       EXTRACT_16BITS(&dp->ip6f_offlg) & IP6F_OFF_MASK,
-		       sizeof(struct ip6_hdr) + EXTRACT_16BITS(&ip6->ip6_plen) -
-			       (long)(bp - bp2) - sizeof(struct ip6_frag)));
+		ND_PRINT("frag (0x%08x:%u|%u)",
+		       GET_BE_U_4(dp->ip6f_ident),
+		       GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK,
+		       (u_int)(sizeof(struct ip6_hdr) + GET_BE_U_2(ip6->ip6_plen) -
+			       (bp - bp2) - sizeof(struct ip6_frag)));
 	} else {
-		ND_PRINT((ndo, "frag (%d|%ld)",
-		       EXTRACT_16BITS(&dp->ip6f_offlg) & IP6F_OFF_MASK,
-		       sizeof(struct ip6_hdr) + EXTRACT_16BITS(&ip6->ip6_plen) -
-			       (long)(bp - bp2) - sizeof(struct ip6_frag)));
+		ND_PRINT("frag (%u|%u)",
+		       GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK,
+		       (u_int)(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_16BITS(&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, " "));
+		ND_PRINT(" ");
 		return sizeof(struct ip6_frag);
 	}
 trunc:
-	ND_PRINT((ndo, "[|frag]"));
+	nd_print_trunc(ndo);
 	return -1;
 }
-#endif /* INET6 */