ignore pcap files which are generated from .puu files.

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index d596dbe846cfe5d81ed836ad8e3a1efb1985ea5e..be01643100f4e911d502e97f9c8d8c44ba2a98ed 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -30,7 +30,7 @@ static const char copyright[] =
     "@(#) 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[] =
     "@(#) 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[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.197 2003-01-07 09:51:20 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.216 2003-11-04 07:29:16 guy Exp $ (LBL)";

 #endif
 
 /*
 #endif
 
 /*


@@ -69,7 +69,6 @@ extern int SIZE_BUF;
 #include "gmt2local.h"
 #include "pcap-missing.h"
 
 #include "gmt2local.h"
 #include "pcap-missing.h"
 

-int aflag;                     /* translate network and broadcast addresses */

 int dflag;                     /* print filter code */
 int eflag;                     /* print ethernet header */
 int fflag;                     /* don't translate "foreign" IP address */
 int dflag;                     /* print filter code */
 int eflag;                     /* print ethernet header */
 int fflag;                     /* don't translate "foreign" IP address */


@@ -119,6 +118,7 @@ RETSIGTYPE requestinfo(int);
 #endif
 
 static void info(int);
 #endif
 
 static void info(int);

+static u_int packets_captured;

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


@@ -132,6 +132,9 @@ struct printer {
 
 static struct printer printers[] = {
        { arcnet_if_print,      DLT_ARCNET },
 
 static struct printer printers[] = {
        { arcnet_if_print,      DLT_ARCNET },

+#ifdef DLT_ARCNET_LINUX
+       { arcnet_linux_if_print, DLT_ARCNET_LINUX },
+#endif

        { ether_if_print,       DLT_EN10MB },
        { token_if_print,       DLT_IEEE802 },
 #ifdef DLT_LANE8023
        { ether_if_print,       DLT_EN10MB },
        { token_if_print,       DLT_IEEE802 },
 #ifdef DLT_LANE8023


@@ -144,9 +147,13 @@ static struct printer printers[] = {
        { cip_if_print,         DLT_ATM_CLIP },
 #endif
        { sl_if_print,          DLT_SLIP },
        { cip_if_print,         DLT_ATM_CLIP },
 #endif
        { sl_if_print,          DLT_SLIP },

+#ifdef DLT_SLIP_BSDOS

        { sl_bsdos_if_print,    DLT_SLIP_BSDOS },
        { sl_bsdos_if_print,    DLT_SLIP_BSDOS },

+#endif

        { ppp_if_print,         DLT_PPP },
        { ppp_if_print,         DLT_PPP },

+#ifdef DLT_PPP_BSDOS

        { ppp_bsdos_if_print,   DLT_PPP_BSDOS },
        { ppp_bsdos_if_print,   DLT_PPP_BSDOS },

+#endif

        { fddi_if_print,        DLT_FDDI },
        { null_if_print,        DLT_NULL },
 #ifdef DLT_LOOP
        { fddi_if_print,        DLT_FDDI },
        { null_if_print,        DLT_NULL },
 #ifdef DLT_LOOP


@@ -195,6 +202,9 @@ static struct printer printers[] = {
 #endif
 #ifdef DLT_IEEE802_11_RADIO
        { ieee802_11_radio_if_print,    DLT_IEEE802_11_RADIO },
 #endif
 #ifdef DLT_IEEE802_11_RADIO
        { ieee802_11_radio_if_print,    DLT_IEEE802_11_RADIO },

+#endif
+#ifdef DLT_ENC
+       { enc_if_print,         DLT_ENC },

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


@@ -307,16 +317,10 @@ main(int argc, char **argv)
        pcap_if_t *devpointer;
        int devnum;
 #endif
        pcap_if_t *devpointer;
        int devnum;
 #endif

+       int status;

 #ifdef WIN32
 #ifdef WIN32

-       DWORD dwVersion;
-       DWORD dwWindowsMajorVersion;
-       u_int UserBufferSize=1000000;
-#endif
-
-#ifdef WIN32
-       dwVersion=GetVersion();         /* get the OS version */
-       dwWindowsMajorVersion =  (DWORD)(LOBYTE(LOWORD(dwVersion)));
-       if(wsockinit()!=0) return 1;
+       u_int UserBufferSize = 1000000;
+       if(wsockinit() != 0) return 1;

 #endif /* WIN32 */
 
        cnt = -1;
 #endif /* WIN32 */
 
        cnt = -1;


@@ -342,7 +346,7 @@ main(int argc, char **argv)
                switch (op) {
 
                case 'a':
                switch (op) {
 
                case 'a':

-                       ++aflag;
+                       /* compatibility for old -a */

                        break;
 
                case 'A':
                        break;
 
                case 'A':


@@ -532,6 +536,10 @@ main(int argc, char **argv)
                                packettype = PT_SNMP;
                        else if (strcasecmp(optarg, "cnfp") == 0)
                                packettype = PT_CNFP;
                                packettype = PT_SNMP;
                        else if (strcasecmp(optarg, "cnfp") == 0)
                                packettype = PT_CNFP;

+                       else if (strcasecmp(optarg, "tftp") == 0)
+                               packettype = PT_TFTP;
+                       else if (strcasecmp(optarg, "aodv") == 0)
+                               packettype = PT_AODV;

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


@@ -589,25 +597,34 @@ main(int argc, char **argv)
                        /* NOTREACHED */
                }
 
                        /* NOTREACHED */
                }
 

-       if (aflag && nflag)
-               error("-a and -n options are incompatible");
-

        if (tflag > 0)
                thiszone = gmt2local(0);
 
        if (RFileName != NULL) {
        if (tflag > 0)
                thiszone = gmt2local(0);
 
        if (RFileName != NULL) {

+               int dlt;
+               const char *dlt_name;
+
+#ifndef WIN32

                /*
                /*

-                * We don't need network access, so set it back to the user id.
-                * Also, this prevents the user from reading anyone's
-                * trace file.
+                * We don't need network access, so relinquish any set-UID
+                * or set-GID privileges we have (if any).
+                *
+                * We do *not* want set-UID privileges when opening a
+                * trace file, as that might let the user read other
+                * people's trace files (especially if we're set-UID
+                * root).

                 */
                 */

-#ifndef WIN32

                setuid(getuid());
 #endif /* WIN32 */
                setuid(getuid());
 #endif /* WIN32 */

-

                pd = pcap_open_offline(RFileName, ebuf);
                if (pd == NULL)
                        error("%s", ebuf);
                pd = pcap_open_offline(RFileName, ebuf);
                if (pd == NULL)
                        error("%s", ebuf);

+               dlt = pcap_datalink(pd);
+               dlt_name = pcap_datalink_val_to_name(dlt);
+               if (dlt_name == NULL)
+                       dlt_name = "???";
+                printf("reading from file %s, link-type %u (%s)\n",
+                      RFileName, dlt, dlt_name);

                localnet = 0;
                netmask = 0;
                if (fflag != 0)
                localnet = 0;
                netmask = 0;
                if (fflag != 0)


@@ -619,10 +636,22 @@ main(int argc, char **argv)
                                error("%s", ebuf);
                }
 #ifdef WIN32
                                error("%s", ebuf);
                }
 #ifdef WIN32

-               PrintCapBegins(program_name,device);
+               if(IsTextUnicode(device,  
+                       wcslen((short*)device),                // Device always ends with a double \0, so this way to determine its 
+                                                                                                       // length should be always valid
+                       NULL))
+               {
+                       fprintf(stderr, "%s: listening on %ws\n", program_name, device);
+               }
+               else
+               {
+                       fprintf(stderr, "%s: listening on %s\n", program_name, device);
+               }
+
+               fflush(stderr); 

 #endif /* WIN32 */
                *ebuf = '\0';
 #endif /* WIN32 */
                *ebuf = '\0';

-               pd = pcap_open_live(device, snaplen, !pflag, 1000, ebuf);
+               pd = pcap_open_live(device, snaplen, !pflag, 10000, ebuf);

                if (pd == NULL)
                        error("%s", ebuf);
                else if (*ebuf)
                if (pd == NULL)
                        error("%s", ebuf);
                else if (*ebuf)


@@ -685,6 +714,9 @@ main(int argc, char **argv)
        }
        init_addrtoname(localnet, netmask);
 
        }
        init_addrtoname(localnet, netmask);
 

+#ifndef WIN32  
+       (void)setsignal(SIGPIPE, cleanup);
+#endif /* WIN32 */

        (void)setsignal(SIGTERM, cleanup);
        (void)setsignal(SIGINT, cleanup);
        /* Cooperate with nohup(1) */
        (void)setsignal(SIGTERM, cleanup);
        (void)setsignal(SIGINT, cleanup);
        /* Cooperate with nohup(1) */


@@ -727,38 +759,89 @@ main(int argc, char **argv)
 #endif
 #ifndef WIN32
        if (RFileName == NULL) {
 #endif
 #ifndef WIN32
        if (RFileName == NULL) {

-            if (vflag == 0)
-                (void)fprintf(stderr, "%s: verbose output suppressed, use -v or -vv for full protocol decode\n",program_name);
-            (void)fprintf(stderr, "listening on %s, capture size %u bytes\n", device, snaplen);
-            (void)fflush(stderr);
+               int dlt;
+               const char *dlt_name;
+
+               if (!vflag && !WFileName) {
+                       (void)fprintf(stderr,
+                           "%s: verbose output suppressed, use -v or -vv for full protocol decode\n",
+                           program_name);
+               } else
+                       (void)fprintf(stderr, "%s: ", program_name);
+               dlt = pcap_datalink(pd);
+               dlt_name = pcap_datalink_val_to_name(dlt);
+               if (dlt_name == NULL)
+                       dlt_name = "???";
+               (void)fprintf(stderr, "listening on %s, link-type %u (%s), capture size %u bytes\n",
+                   device, dlt, dlt_name, snaplen);
+               (void)fflush(stderr);

        }
 #endif /* WIN32 */
        }
 #endif /* WIN32 */

-       if (pcap_loop(pd, cnt, callback, pcap_userdata) < 0) {
+       status = pcap_loop(pd, cnt, callback, pcap_userdata);
+       if (WFileName == NULL) {
+               /*
+                * We're printing packets.  Flush the printed output,
+                * so it doesn't get intermingled with error output.
+                */
+               if (status == -2) {
+                       /*
+                        * We got interrupted, so perhaps we didn't
+                        * manage to finish a line we were printing.
+                        * Print an extra newline, just in case.
+                        */
+                       putchar('\n');
+               }
+               (void)fflush(stdout);
+       }
+       if (status == -1) {
+               /*
+                * Error.  Report it.
+                */

                (void)fprintf(stderr, "%s: pcap_loop: %s\n",
                    program_name, pcap_geterr(pd));
                (void)fprintf(stderr, "%s: pcap_loop: %s\n",
                    program_name, pcap_geterr(pd));

-               cleanup(0);
-               pcap_close(pd);
-               exit(1);

        }
        }

-       if (RFileName == NULL)
+       if (RFileName == NULL) {
+               /*
+                * We're doing a live capture.  Report the capture
+                * statistics.
+                */

                info(1);
                info(1);

+       }

        pcap_close(pd);
        pcap_close(pd);

-       exit(0);
+       exit(status == -1 ? 1 : 0);

 }
 
 /* make a clean exit on interrupts */
 static RETSIGTYPE
 }
 
 /* make a clean exit on interrupts */
 static RETSIGTYPE

-cleanup(int signo)
+cleanup(int signo _U_)

 {
 {

-
-       /* Can't print the summary if reading from a savefile */
+#ifdef HAVE_PCAP_BREAKLOOP
+       /*
+        * We have "pcap_breakloop()"; use it, so that we do as little
+        * as possible in the signal handler (it's probably not safe
+        * to do anything with standard I/O streams in a signal handler -
+        * the ANSI C standard doesn't say it is).
+        */
+       pcap_breakloop(pd);
+#else
+       /*
+        * We don't have "pcap_breakloop()"; this isn't safe, but
+        * it's the best we can do.  Print the summary if we're
+        * not reading from a savefile - i.e., if we're doing a
+        * live capture - and exit.
+        */

        if (pd != NULL && pcap_file(pd) == NULL) {
        if (pd != NULL && pcap_file(pd) == NULL) {

+               /*
+                * We got interrupted, so perhaps we didn't
+                * manage to finish a line we were printing.
+                * Print an extra newline, just in case.
+                */
+               putchar('\n');

                (void)fflush(stdout);
                (void)fflush(stdout);

-               putc('\n', stderr);

                info(1);
        }
                info(1);
        }

-       if (signo)
-               exit(0);
+       exit(0);
+#endif

 }
 
 static void
 }
 
 static void


@@ -774,6 +857,11 @@ info(register int verbose)
        if (!verbose)
                fprintf(stderr, "%s: ", program_name);
 
        if (!verbose)
                fprintf(stderr, "%s: ", program_name);
 

+       (void)fprintf(stderr, "%u packets captured", packets_captured);
+       if (!verbose)
+               fputs(", ", stderr);
+       else
+               putc('\n', stderr);

        (void)fprintf(stderr, "%d packets received by filter", stat.ps_recv);
        if (!verbose)
                fputs(", ", stderr);
        (void)fprintf(stderr, "%d packets received by filter", stat.ps_recv);
        if (!verbose)
                fputs(", ", stderr);


@@ -817,6 +905,8 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
        static uint cnt = 2;
        char *name;
 
        static uint cnt = 2;
        char *name;
 

+       ++packets_captured;
+

        ++infodelay;
 
        dump_info = (struct dump_info *)user;
        ++infodelay;
 
        dump_info = (struct dump_info *)user;


@@ -854,6 +944,8 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
 static void
 dump_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 {
 static void
 dump_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 {

+       ++packets_captured;
+

        ++infodelay;
 
        pcap_dump(user, h, sp);
        ++infodelay;
 
        pcap_dump(user, h, sp);


@@ -873,6 +965,8 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
        struct print_info *print_info;
        u_int hdrlen;
 
        struct print_info *print_info;
        u_int hdrlen;
 

+       ++packets_captured;
+

        ++infodelay;
        ts_print(&h->ts);
 
        ++infodelay;
        ts_print(&h->ts);
 


@@ -988,21 +1082,28 @@ static void
 usage(void)
 {
        extern char version[];
 usage(void)
 {
        extern char version[];

+#ifndef HAVE_PCAP_LIB_VERSION

 #if defined(WIN32) || defined(HAVE_PCAP_VERSION)
        extern char pcap_version[];
 #if defined(WIN32) || defined(HAVE_PCAP_VERSION)
        extern char pcap_version[];

-#else
+#else /* defined(WIN32) || defined(HAVE_PCAP_VERSION) */

        static char pcap_version[] = "unknown";
        static char pcap_version[] = "unknown";

-#endif
+#endif /* defined(WIN32) || defined(HAVE_PCAP_VERSION) */
+#endif /* HAVE_PCAP_LIB_VERSION */

 
 

+#ifdef HAVE_PCAP_LIB_VERSION
+       (void)fprintf(stderr, "%s version %s\n", program_name, version);
+       (void)fprintf(stderr, "%s\n", pcap_lib_version());
+#else /* HAVE_PCAP_LIB_VERSION */

 #ifdef WIN32
        (void)fprintf(stderr, "%s version %s, based on tcpdump version %s\n", program_name, WDversion, version);
        (void)fprintf(stderr, "WinPcap version %s, based on libpcap version %s\n",Wpcap_version, pcap_version);
 #ifdef WIN32
        (void)fprintf(stderr, "%s version %s, based on tcpdump version %s\n", program_name, WDversion, version);
        (void)fprintf(stderr, "WinPcap version %s, based on libpcap version %s\n",Wpcap_version, pcap_version);

-#else  
+#else /* WIN32 */

        (void)fprintf(stderr, "%s version %s\n", program_name, version);
        (void)fprintf(stderr, "libpcap version %s\n", pcap_version);
 #endif /* WIN32 */
        (void)fprintf(stderr, "%s version %s\n", program_name, version);
        (void)fprintf(stderr, "libpcap version %s\n", pcap_version);
 #endif /* WIN32 */

+#endif /* HAVE_PCAP_LIB_VERSION */

        (void)fprintf(stderr,
        (void)fprintf(stderr,

-"Usage: %s [-aAd" D_FLAG "eflLnNOpqRStu" U_FLAG "vxXy]" B_FLAG_USAGE " [-c count] [ -C file_size ]\n", program_name);
+"Usage: %s [-aAd" D_FLAG "eflLnNOpqRStu" U_FLAG "vxX]" B_FLAG_USAGE " [-c count] [ -C file_size ]\n", program_name);

        (void)fprintf(stderr,
 "\t\t[ -E algo:secret ] [ -F file ] [ -i interface ] [ -r file ]\n");
        (void)fprintf(stderr,
        (void)fprintf(stderr,
 "\t\t[ -E algo:secret ] [ -F file ] [ -i interface ] [ -r file ]\n");
        (void)fprintf(stderr,