Revert partially the commit 21b1273

[tcpdump] / print-frag6.c

diff --git a/print-frag6.c b/print-frag6.c
index 6a85cfe267e9e0c73ebcb8ad3c38903d951a1c65..818cce2ac53c17242fd2e054376e7e9ebe1dd943 100644 (file)
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -19,82 +19,53 @@
  * 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
-
-#ifdef INET6
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+/* \summary: IPv6 fragmentation header printer */
 
-#include <net/if.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>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
-#include <stdio.h>
+#include "netdissect-stdinc.h"
 
-#include <netinet/ip6.h>
+#include "netdissect.h"
+#include "extract.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;
+       const struct ip6_frag *dp;
+       const struct ip6_hdr *ip6;
 
-#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;
+       ndo->ndo_protocol = "frag6";
+       dp = (const struct ip6_frag *)bp;
+       ip6 = (const struct ip6_hdr *)bp2;
 
-       /* 'ep' points to the end of avaible data. */
-       ep = snapend;
+       ND_TCHECK_SIZE(dp);
 
-       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));
+       if (ndo->ndo_vflag) {
+               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 {
-               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 (%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)));
        }
 
-#if 0
        /* 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
+       nd_print_trunc(ndo);
+       return -1;
 }
-#endif /* INET6 */