Add SIGINFO handler from LBL

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 1e8271a29108bba77210d8fd77749911b7516259..1ec0a0ff7b0278713b87af6f5c59858f43d447eb 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
+ * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000

  *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without


@@ -21,10 +21,10 @@
 
 #ifndef lint
 static const char copyright[] =
 
 #ifndef lint
 static const char copyright[] =

-    "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997\n\
+    "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\

 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] =
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.132 1999-10-30 05:11:23 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.166 2001-07-04 22:03:13 fenner 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,27 +69,31 @@ 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;
 

+int infodelay;
+int infoprint;

 
 char *program_name;
 
 int32_t thiszone;              /* seconds offset from gmt to local time */
 
 
 char *program_name;
 
 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));
+#ifdef SIGINFO
+RETSIGTYPE requestinfo(int);
+#endif

 
 /* Length of saved portion of packet. */
 int snaplen = DEFAULT_SNAPLEN;
 
 /* Length of saved portion of packet. */
 int snaplen = DEFAULT_SNAPLEN;


@@ -97,18 +104,49 @@ struct printer {
 };
 
 static struct printer printers[] = {
 };
 
 static struct printer printers[] = {

+       { arcnet_if_print,      DLT_ARCNET },

        { ether_if_print,       DLT_EN10MB },
        { 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 },
        { ppp_if_print,         DLT_PPP },
        { ppp_bsdos_if_print,   DLT_PPP_BSDOS },
        { fddi_if_print,        DLT_FDDI },
        { null_if_print,        DLT_NULL },
        { sl_if_print,          DLT_SLIP },
        { sl_bsdos_if_print,    DLT_SLIP_BSDOS },
        { ppp_if_print,         DLT_PPP },
        { 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_HDLC
+       { chdlc_if_print,       DLT_HDLC },
+#endif
+#ifdef DLT_PPP_SERIAL
+       { ppp_hdlc_if_print,    DLT_PPP_SERIAL },
+#endif
+#ifdef DLT_PPP_ETHER
+       { pppoe_if_print,       DLT_PPP_ETHER },
+#endif
+#ifdef DLT_LINUX_SLL
+       { sll_if_print,         DLT_LINUX_SLL },
+#endif
+#ifdef DLT_IEEE802_11
+       { ieee802_11_if_print,  DLT_IEEE802_11},
+#endif
+#ifdef DLT_LTALK
+       { ltalk_if_print,       DLT_LTALK },

 #endif
        { NULL,                 0 },
 };
 #endif
        { NULL,                 0 },
 };


@@ -122,7 +160,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 */
 }
 


@@ -154,27 +192,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)


@@ -190,7 +223,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;


@@ -224,6 +257,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;


@@ -244,11 +289,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;


@@ -271,10 +322,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;


@@ -282,6 +339,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':
                        {


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

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

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


@@ -327,9 +390,12 @@ main(int argc, char **argv)
                        if (device == NULL)
                                error("%s", ebuf);
                }
                        if (device == NULL)
                                error("%s", ebuf);
                }

+               *ebuf = '\0';

                pd = pcap_open_live(device, snaplen, !pflag, 1000, ebuf);
                if (pd == NULL)
                        error("%s", ebuf);
                pd = pcap_open_live(device, snaplen, !pflag, 1000, ebuf);
                if (pd == NULL)
                        error("%s", ebuf);

+               else if (*ebuf)
+                       warning("%s", ebuf);

                i = pcap_snapshot(pd);
                if (snaplen < i) {
                        warning("snaplen raised from %d to %d", snaplen, i);
                i = pcap_snapshot(pd);
                if (snaplen < i) {
                        warning("snaplen raised from %d to %d", snaplen, i);


@@ -375,6 +441,9 @@ main(int argc, char **argv)
        } else {
                printer = lookup_printer(pcap_datalink(pd));
                pcap_userdata = 0;
        } else {
                printer = lookup_printer(pcap_datalink(pd));
                pcap_userdata = 0;

+#ifdef SIGINFO
+               (void)setsignal(SIGINFO, requestinfo);
+#endif

        }
        if (RFileName == NULL) {
                (void)fprintf(stderr, "%s: listening on %s\n",
        }
        if (RFileName == NULL) {
                (void)fprintf(stderr, "%s: listening on %s\n",


@@ -391,86 +460,85 @@ main(int argc, char **argv)
 }
 
 /* make a clean exit on interrupts */
 }
 
 /* make a clean exit on interrupts */

-RETSIGTYPE
+static RETSIGTYPE

 cleanup(int signo)
 {
 cleanup(int signo)
 {

-       struct pcap_stat stat;

 
        /* Can't print the summary if reading from a savefile */
        if (pd != NULL && pcap_file(pd) == NULL) {
                (void)fflush(stdout);
                putc('\n', stderr);
 
        /* Can't print the summary if reading from a savefile */
        if (pd != NULL && pcap_file(pd) == NULL) {
                (void)fflush(stdout);
                putc('\n', stderr);

-               if (pcap_stats(pd, &stat) < 0)
-                       (void)fprintf(stderr, "pcap_stats: %s\n",
-                           pcap_geterr(pd));
-               else {
-                       (void)fprintf(stderr, "%d packets received by filter\n",
-                           stat.ps_recv);
-                       (void)fprintf(stderr, "%d packets dropped by kernel\n",
-                           stat.ps_drop);
-               }
+               info(1);

        }
        exit(0);
 }
 
        }
        exit(0);
 }
 

+void
+info(register int verbose)
+{
+       struct pcap_stat stat;
+
+       if (pcap_stats(pd, &stat) < 0) {
+               (void)fprintf(stderr, "pcap_stats: %s\n", pcap_geterr(pd));
+               return;
+       }
+       if (!verbose)
+               fprintf(stderr, "%s: ", program_name);
+       (void)fprintf(stderr, "%d packets received by filter", stat.ps_recv);
+       if (!verbose)
+               fputs(", ", stderr);
+       else
+               putc('\n', stderr);
+       (void)fprintf(stderr, "%d packets dropped by kernel\n", stat.ps_drop);
+       infoprint = 0;
+}
+

 /* Like default_print() but data need not be aligned */
 void
 default_print_unaligned(register const u_char *cp, register u_int length)
 {
 /* Like default_print() but data need not be aligned */
 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) {
-    
-    snprintf(line+20+i*5, 7, "%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
+#ifdef SIGINFO
+RETSIGTYPE requestinfo(int signo)
+{
+       if (infodelay)
+               ++infoprint;
+       else
+               info(0);
+}
+#endif
+
+static void

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


@@ -479,10 +547,10 @@ 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,
 "\t\t[ -T type ] [ -w file ] [ expression ]\n");
        (void)fprintf(stderr,
 "\t\t[ -i interface ] [ -r file ] [ -s snaplen ]\n");
        (void)fprintf(stderr,
 "\t\t[ -T type ] [ -w file ] [ expression ]\n");

-       exit(-1);
+       exit(1);

 }
 }