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

diff --git a/print-frag6.c b/print-frag6.c
index 533d730d..abc2a636 100644
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -19,73 +19,47 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-frag6.c,v 1.13 2001-09-17 21:58:02 fenner Exp $";
-#endif
+/* \summary: IPv6 fragmentation header printer */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>
 
-#ifdef INET6
+#include "netdissect-stdinc.h"
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-
-#include <netinet/in.h>
-
-#include <stdio.h>
+#define ND_LONGJMP_FROM_TCHECK
+#include "netdissect.h"
+#include "extract.h"
 
 #include "ip6.h"
 
-#include "interface.h"
-#include "addrtoname.h"
-
 int
-frag6_print(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;
-	register const u_char *ep;
+	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;
 
-	/* 'ep' points to the end of available data. */
-	ep = snapend;
-
-	TCHECK(dp->ip6f_offlg);
-
-	if (vflag) {
-		printf("frag (0x%08x:%d|%ld)",
-		       (u_int32_t)ntohl(dp->ip6f_ident),
-		       ntohs(dp->ip6f_offlg & IP6F_OFF_MASK),
-		       sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) -
-			       (long)(bp - bp2) - sizeof(struct ip6_frag));
-	} else {
-		printf("frag (%d|%ld)",
-		       ntohs(dp->ip6f_offlg & IP6F_OFF_MASK),
-		       sizeof(struct ip6_hdr) + ntohs(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));
 
-#if 1
 	/* it is meaningless to decode non-first fragment */
-	if (ntohs(dp->ip6f_offlg & IP6F_OFF_MASK) != 0)
-		return 65535;
-	else
-#endif
-	{
-		fputs(" ", stdout);
+	if ((GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK) != 0)
+		return -1;
+	else {
+		ND_PRINT(" ");
 		return sizeof(struct ip6_frag);
 	}
-trunc:
-	fputs("[|frag]", stdout);
-	return 65535;
-#undef TCHECK
 }
-#endif /* INET6 */