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 54809fc5bc1adac964ba98113256a310e9edbe53..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[] =
     "@(#) 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.134 1999-11-21 03:50:26 assar Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.158 2000-12-21 10:43:24 guy Exp $ (LBL)";

 #endif
 
 /*
 #endif
 
 /*


@@ -35,6 +35,10 @@ static const char rcsid[] =
  * combined efforts of Van, Steve McCanne and Craig Leres of LBL.
  */
 
  * combined efforts of Van, Steve McCanne and Craig Leres of LBL.
  */
 

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+

 #include <sys/types.h>
 #include <sys/time.h>
 
 #include <sys/types.h>
 #include <sys/time.h>
 


@@ -46,9 +50,8 @@ static const char rcsid[] =
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

+#include <ctype.h>

 
 

-#include <netinet/in_systm.h>
-#include <netinet/ip.h>

 
 #include "interface.h"
 #include "addrtoname.h"
 
 #include "interface.h"
 #include "addrtoname.h"


@@ -66,12 +69,14 @@ int Oflag = 1;                      /* run filter code optimizer */
 int pflag;                     /* don't go promiscuous */
 int qflag;                     /* quick (shorter) output */
 int Rflag = 1;                 /* print sequence # field in AH/ESP*/
 int pflag;                     /* don't go promiscuous */
 int qflag;                     /* quick (shorter) output */
 int Rflag = 1;                 /* print sequence # field in AH/ESP*/

+int sflag = 0;                 /* use the libsmi to translate OIDs */

 int Sflag;                     /* print raw TCP sequence numbers */
 int tflag = 1;                 /* print packet arrival time */
 int Sflag;                     /* print raw TCP sequence numbers */
 int tflag = 1;                 /* print packet arrival time */

+int uflag = 0;                 /* Print undecoded NFS handles */

 int vflag;                     /* verbose */
 int xflag;                     /* print packet in hex */
 int vflag;                     /* verbose */
 int xflag;                     /* print packet in hex */

+int Xflag;                     /* print packet in ascii as well as hex */

 
 

-char *ahsecret = NULL;         /* AH secret key */

 char *espsecret = NULL;                /* ESP secret key */
 
 int packettype;
 char *espsecret = NULL;                /* ESP secret key */
 
 int packettype;


@@ -81,12 +86,9 @@ char *program_name;
 
 int32_t thiszone;              /* seconds offset from gmt to local time */
 
 
 int32_t thiszone;              /* seconds offset from gmt to local time */
 

-/* Externs */
-extern void bpf_dump(struct bpf_program *, int);
-

 /* Forwards */
 /* 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;
 
 /* Length of saved portion of packet. */
 int snaplen = DEFAULT_SNAPLEN;


@@ -98,12 +100,15 @@ struct printer {
 
 static struct printer printers[] = {
        { ether_if_print,       DLT_EN10MB },
 
 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 },
 #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 },
 #endif
        { sl_if_print,          DLT_SLIP },
        { sl_bsdos_if_print,    DLT_SLIP_BSDOS },


@@ -111,10 +116,19 @@ static struct printer printers[] = {
        { ppp_bsdos_if_print,   DLT_PPP_BSDOS },
        { fddi_if_print,        DLT_FDDI },
        { null_if_print,        DLT_NULL },
        { 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 },
        { 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 },
 };
 #endif
        { NULL,                 0 },
 };


@@ -128,7 +142,7 @@ lookup_printer(int type)
                if (type == p->type)
                        return p->f;
 
                if (type == p->type)
                        return p->f;
 

-       error("unknown data link type 0x%x", type);
+       error("unknown data link type %d", type);

        /* NOTREACHED */
 }
 
        /* NOTREACHED */
 }
 


@@ -160,27 +174,22 @@ main(int argc, char **argv)
        else
                program_name = argv[0];
 
        else
                program_name = argv[0];
 

-       if (abort_on_misalignment(ebuf) < 0)
+       if (abort_on_misalignment(ebuf, sizeof(ebuf)) < 0)

                error("%s", ebuf);
 
                error("%s", ebuf);
 

+#ifdef LIBSMI
+       smiInit("tcpdump");
+#endif
+       

        opterr = 0;
        while (
        opterr = 0;
        while (

-           (op = getopt(argc, argv, "ac:deE:fF:i:lnNOpqr:Rs:StT:vw:xY")) != EOF)
+           (op = getopt(argc, argv, "ac:deE:fF:i:lm:nNOpqr:Rs:StT:uvw:xXY")) != -1)

                switch (op) {
 
                case 'a':
                        ++aflag;
                        break;
 
                switch (op) {
 
                case 'a':
                        ++aflag;
                        break;
 

-#if 0
-               case 'A':
-#ifndef CRYPTO
-                       warning("crypto code not compiled in");
-#endif
-                       ahsecret = optarg;
-                       break;
-#endif
-

                case 'c':
                        cnt = atoi(optarg);
                        if (cnt <= 0)
                case 'c':
                        cnt = atoi(optarg);
                        if (cnt <= 0)


@@ -196,7 +205,7 @@ main(int argc, char **argv)
                        break;
 
                case 'E':
                        break;
 
                case 'E':

-#ifndef CRYPTO
+#ifndef HAVE_LIBCRYPTO

                        warning("crypto code not compiled in");
 #endif
                        espsecret = optarg;
                        warning("crypto code not compiled in");
 #endif
                        espsecret = optarg;


@@ -230,6 +239,18 @@ main(int argc, char **argv)
                        ++Nflag;
                        break;
 
                        ++Nflag;
                        break;
 

+               case 'm':
+#ifdef LIBSMI
+                       if (smiLoadModule(optarg) == 0) {
+                               error("could not load MIB module %s", optarg);
+                       }
+                       sflag = 1;
+#else
+                       (void)fprintf(stderr, "%s: ignoring option `-m %s' ",
+                                     program_name, optarg);
+                       (void)fprintf(stderr, "(no libsmi support)\n");
+#endif
+                       

                case 'O':
                        Oflag = 0;
                        break;
                case 'O':
                        Oflag = 0;
                        break;


@@ -250,11 +271,17 @@ main(int argc, char **argv)
                        Rflag = 0;
                        break;
 
                        Rflag = 0;
                        break;
 

-               case 's':
-                       snaplen = atoi(optarg);
-                       if (snaplen <= 0)
+               case 's': {
+                       char *end;
+
+                       snaplen = strtol(optarg, &end, 0);
+                       if (optarg == end || *end != '\0'
+                           || snaplen < 0 || snaplen > 65535)

                                error("invalid snaplen %s", optarg);
                                error("invalid snaplen %s", optarg);

+                       else if (snaplen == 0)
+                               snaplen = 65535;

                        break;
                        break;

+               }

 
                case 'S':
                        ++Sflag;
 
                case 'S':
                        ++Sflag;


@@ -277,10 +304,16 @@ main(int argc, char **argv)
                                packettype = PT_RTCP;
                        else if (strcasecmp(optarg, "snmp") == 0)
                                packettype = PT_SNMP;
                                packettype = PT_RTCP;
                        else if (strcasecmp(optarg, "snmp") == 0)
                                packettype = PT_SNMP;

+                       else if (strcasecmp(optarg, "cnfp") == 0)
+                               packettype = PT_CNFP;

                        else
                                error("unknown packet type `%s'", optarg);
                        break;
 
                        else
                                error("unknown packet type `%s'", optarg);
                        break;
 

+               case 'u':
+                       ++uflag;
+                       break;
+                       

                case 'v':
                        ++vflag;
                        break;
                case 'v':
                        ++vflag;
                        break;


@@ -288,6 +321,16 @@ main(int argc, char **argv)
                case 'w':
                        WFileName = optarg;
                        break;
                case 'w':
                        WFileName = optarg;
                        break;

+
+               case 'x':
+                       ++xflag;
+                       break;
+
+               case 'X':
+                       ++xflag;
+                       ++Xflag;
+                       break;
+

 #ifdef YYDEBUG
                case 'Y':
                        {
 #ifdef YYDEBUG
                case 'Y':
                        {


@@ -297,10 +340,6 @@ main(int argc, char **argv)
                        }
                        break;
 #endif
                        }
                        break;
 #endif

-               case 'x':
-                       ++xflag;
-                       break;
-

                default:
                        usage();
                        /* NOTREACHED */
                default:
                        usage();
                        /* NOTREACHED */


@@ -397,7 +436,7 @@ main(int argc, char **argv)
 }
 
 /* make a clean exit on interrupts */
 }
 
 /* make a clean exit on interrupts */

-RETSIGTYPE
+static RETSIGTYPE

 cleanup(int signo)
 {
        struct pcap_stat stat;
 cleanup(int signo)
 {
        struct pcap_stat stat;


@@ -423,60 +462,38 @@ cleanup(int signo)
 void
 default_print_unaligned(register const u_char *cp, register u_int length)
 {
 void
 default_print_unaligned(register const u_char *cp, register u_int length)
 {

-  register u_int i, s;
-  register int nshorts;
-
-  char line[81];
-  
-  nshorts = (u_int) length / sizeof(u_short);
-  i = 0;
-  memset(line, ' ', 80);
-  line[81]='\0';
-
-  putchar('\n');
-  while (nshorts >= 0) {
-    
-    sprintf(line+20+i*5, "%02x%02x  ", cp[0], cp[1]);
-
-    if(isprint(cp[0])) {
-      line[62+i*2]=cp[0];
-    } else {
-      line[62+i*2]='.';
-    }
-    if(isprint(cp[1])) {
-      line[62+i*2+1]=cp[1];
-    } else {
-      line[62+i*2+1]='.';
-    }
-    i++;
-    if (i == 8) {
-      line[60]=' ';
-      line[61]=' ';
-      line[62+16]='\0';
-      puts(line);
-      i=0;
-    }
-    cp += 2;
-    nshorts--;
-  }
+       register u_int i, s;
+       register int nshorts;
+
+       if (Xflag) {
+               ascii_print(cp, length);
+               return;
+       }
+       nshorts = (u_int) length / sizeof(u_short);
+       i = 0;
+       while (--nshorts >= 0) {
+               if ((i++ % 8) == 0)
+                       (void)printf("\n\t\t\t");
+               s = *cp++;
+               (void)printf(" %02x%02x", s, *cp++);
+       }
+       if (length & 1) {
+               if ((i % 8) == 0)
+                       (void)printf("\n\t\t\t");
+               (void)printf(" %02x", *cp);
+       }

 }
 
 /*
  * By default, print the packet out in hex.
 }
 
 /*
  * By default, print the packet out in hex.

- *
- * (BTW, please don't send us patches to print the packet out in ascii)

  */
 void
 default_print(register const u_char *bp, register u_int length)
 {
  */
 void
 default_print(register const u_char *bp, register u_int length)
 {

-       register const u_short *sp;
-       register u_int i;
-       register int nshorts;
-

        default_print_unaligned(bp, length);
 }
 
        default_print_unaligned(bp, length);
 }
 

-__dead void
+static void

 usage(void)
 {
        extern char version[];
 usage(void)
 {
        extern char version[];


@@ -485,7 +502,7 @@ usage(void)
        (void)fprintf(stderr, "%s version %s\n", program_name, version);
        (void)fprintf(stderr, "libpcap version %s\n", pcap_version);
        (void)fprintf(stderr,
        (void)fprintf(stderr, "%s version %s\n", program_name, version);
        (void)fprintf(stderr, "libpcap version %s\n", pcap_version);
        (void)fprintf(stderr,

-"Usage: %s [-adeflnNOpqStvx] [-c count] [ -F file ]\n", program_name);
+"Usage: %s [-adeflnNOpqStuvxX] [-c count] [ -F file ]\n", program_name);

        (void)fprintf(stderr,
 "\t\t[ -i interface ] [ -r file ] [ -s snaplen ]\n");
        (void)fprintf(stderr,
        (void)fprintf(stderr,
 "\t\t[ -i interface ] [ -r file ] [ -s snaplen ]\n");
        (void)fprintf(stderr,