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

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index f1bcf48bc5c5329e22346cc068d60b1e5953eff4..223f6ff909f0a3230152ef58db5984cf2abcb525 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -24,7 +24,7 @@ static const char copyright[] =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.147 2000-06-01 01:10:31 assar Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.158 2000-12-21 10:43:24 guy Exp $ (LBL)";
 #endif
 
 /*
@@ -52,8 +52,6 @@ static const char rcsid[] =
 #include <unistd.h>
 #include <ctype.h>
 
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 
 #include "interface.h"
 #include "addrtoname.h"
@@ -88,12 +86,9 @@ char *program_name;
 
 int32_t thiszone;              /* seconds offset from gmt to local time */
 
-/* Externs */
-extern void bpf_dump(struct bpf_program *, int);
-
 /* Forwards */
-RETSIGTYPE cleanup(int);
-extern __dead void usage(void) __attribute__((volatile));
+static RETSIGTYPE cleanup(int);
+static void usage(void) __attribute__((noreturn));
 
 /* Length of saved portion of packet. */
 int snaplen = DEFAULT_SNAPLEN;
@@ -105,12 +100,15 @@ struct printer {
 
 static struct printer printers[] = {
        { ether_if_print,       DLT_EN10MB },
-       { ether_if_print,       DLT_IEEE802 },
+       { token_if_print,       DLT_IEEE802 },
 #ifdef DLT_LANE8023
        { lane_if_print,        DLT_LANE8023 },
 #endif
 #ifdef DLT_CIP
        { cip_if_print,         DLT_CIP },
+#endif
+#ifdef DLT_ATM_CLIP
+       { cip_if_print,         DLT_ATM_CLIP },
 #endif
        { sl_if_print,          DLT_SLIP },
        { sl_bsdos_if_print,    DLT_SLIP_BSDOS },
@@ -118,10 +116,19 @@ static struct printer printers[] = {
        { ppp_bsdos_if_print,   DLT_PPP_BSDOS },
        { fddi_if_print,        DLT_FDDI },
        { null_if_print,        DLT_NULL },
+#ifdef DLT_LOOP
+       { null_if_print,        DLT_LOOP },
+#endif
        { raw_if_print,         DLT_RAW },
        { atm_if_print,         DLT_ATM_RFC1483 },
-#ifdef DLT_CHDLC
-       { chdlc_if_print,       DLT_CHDLC },
+#ifdef DLT_C_HDLC
+       { chdlc_if_print,       DLT_C_HDLC },
+#endif
+#ifdef DLT_PPP_SERIAL
+       { ppp_hdlc_if_print,    DLT_PPP_SERIAL },
+#endif
+#ifdef DLT_LINUX_SLL
+       { sll_if_print,         DLT_LINUX_SLL },
 #endif
        { NULL,                 0 },
 };
@@ -135,7 +142,7 @@ lookup_printer(int type)
                if (type == p->type)
                        return p->f;
 
-       error("unknown data link type 0x%x", type);
+       error("unknown data link type %d", type);
        /* NOTREACHED */
 }
 
@@ -429,7 +436,7 @@ main(int argc, char **argv)
 }
 
 /* make a clean exit on interrupts */
-RETSIGTYPE
+static RETSIGTYPE
 cleanup(int signo)
 {
        struct pcap_stat stat;
@@ -486,7 +493,7 @@ default_print(register const u_char *bp, register u_int length)
        default_print_unaligned(bp, length);
 }
 
-__dead void
+static void
 usage(void)
 {
        extern char version[];