X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ce132b307b6f895a3c591b7150dcad88ac6c0245..c39d40a767a1ae36171e5bcbf6f157ff3e80fb6c:/print-frag6.c

diff --git a/print-frag6.c b/print-frag6.c
index ecb28bac..16e8a4b2 100644
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -19,77 +19,48 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-frag6.c,v 1.12 2000-10-07 05:53:10 itojun Exp $";
-#endif
+/* \summary: IPv6 fragmentation header printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#ifdef INET6
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
+#include "netdissect-stdinc.h"
 
-#include <netinet/in.h>
-
-#include <stdio.h>
+#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;
-
-#if 0
-#define TCHECK(var) if ((u_char *)&(var) >= ep - sizeof(var)) goto trunc
-#endif
-
-	dp = (struct ip6_frag *)bp;
-	ip6 = (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));
+	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;
+
+	if (ndo->ndo_vflag) {
+		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 {
-		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 (%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));
 	}
 
-#if 1
 	/* it is meaningless to decode non-first fragment */
-	if (ntohs(dp->ip6f_offlg & IP6F_OFF_MASK) != 0)
-		return 65535;
+	if ((GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK) != 0)
+		return -1;
 	else
-#endif
 	{
-		fputs(" ", stdout);
+		ND_PRINT(" ");
 		return sizeof(struct ip6_frag);
 	}
-trunc:
-	fputs("[|frag]", stdout);
-	return 65535;
-#undef TCHECK
 }
-#endif /* INET6 */