Handle IPX socket 0x553, which is some kind of NetBIOS-over-IPX socket.

[tcpdump] / print-frag6.c

diff --git a/print-frag6.c b/print-frag6.c
index 6a85cfe267e9e0c73ebcb8ad3c38903d951a1c65..ecb28bac259b908f993f26cba7dc57f65b0fa7a6 100644 (file)
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -21,7 +21,11 @@
 
 #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)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-frag6.c,v 1.12 2000-10-07 05:53:10 itojun Exp $";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
 
 #ifdef INET6
@@ -31,21 +35,12 @@ static const char rcsid[] =
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#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>
 
 #include <stdio.h>
 
-#include <netinet/ip6.h>
+#include "ip6.h"
 
 #include "interface.h"
 #include "addrtoname.h"
@@ -64,25 +59,25 @@ frag6_print(register const u_char *bp, register const u_char *bp2)
        dp = (struct ip6_frag *)bp;
        ip6 = (struct ip6_hdr *)bp2;
 
-       /* 'ep' points to the end of avaible data. */
+       /* 'ep' points to the end of available data. */
        ep = snapend;
 
        TCHECK(dp->ip6f_offlg);
 
        if (vflag) {
-               printf("frag (0x%08x:%d|%d)",
-                      ntohl(dp->ip6f_ident),
+               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) -
-                              (bp - bp2) - sizeof(struct ip6_frag));
+                              (long)(bp - bp2) - sizeof(struct ip6_frag));
        } else {
-               printf("frag (%d|%d)",
+               printf("frag (%d|%ld)",
                       ntohs(dp->ip6f_offlg & IP6F_OFF_MASK),
                       sizeof(struct ip6_hdr) + ntohs(ip6->ip6_plen) -
-                              (bp - bp2) - sizeof(struct ip6_frag));
+                              (long)(bp - bp2) - sizeof(struct ip6_frag));
        }
 
-#if 0
+#if 1
        /* it is meaningless to decode non-first fragment */
        if (ntohs(dp->ip6f_offlg & IP6F_OFF_MASK) != 0)
                return 65535;