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

diff --git a/print-frag6.c b/print-frag6.c
index 6a85cfe2..abc2a636 100644
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -19,82 +19,47 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] =
-    "@(#) /master/usr.sbin/tcpdump/tcpdump/print-icmp.c,v 2.1 1995/02/03 18:14:42 polk Exp (LBL)";
-#endif
+/* \summary: IPv6 fragmentation header printer */
 
-#ifdef INET6
+#include <config.h>
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+#include "netdissect-stdinc.h"
 
-#include <net/if.h>
+#define ND_LONGJMP_FROM_TCHECK
+#include "netdissect.h"
+#include "extract.h"
 
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
-
-#include <stdio.h>
-
-#include <netinet/ip6.h>
-
-#include "interface.h"
-#include "addrtoname.h"
+#include "ip6.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;
+	const struct ip6_frag *dp;
+	const struct ip6_hdr *ip6;
 
-	/* 'ep' points to the end of avaible data. */
-	ep = snapend;
+	ndo->ndo_protocol = "frag6";
+	dp = (const struct ip6_frag *)bp;
+	ip6 = (const struct ip6_hdr *)bp2;
 
-	TCHECK(dp->ip6f_offlg);
-
-	if (vflag) {
-		printf("frag (0x%08x:%d|%d)",
-		       ntohl(dp->ip6f_ident),
-		       ntohs(dp->ip6f_offlg & IP6F_OFF_MASK),
-		       sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) -
-			       (bp - bp2) - sizeof(struct ip6_frag));
-	} else {
-		printf("frag (%d|%d)",
-		       ntohs(dp->ip6f_offlg & IP6F_OFF_MASK),
-		       sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) -
-			       (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 0
 	/* 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 */