Make the default snapshot length the maximum; add a #define for the

[tcpdump] / tcpdump.c

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

-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.250 2004-11-07 22:05:20 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.283 2008-09-25 21:45:50 guy Exp $ (LBL)";

 #endif
 
 /*
 #endif
 
 /*


@@ -65,12 +65,16 @@ extern int SIZE_BUF;
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <limits.h>

 #ifndef WIN32
 #ifndef WIN32

+#include <sys/wait.h>
+#include <sys/resource.h>

 #include <pwd.h>
 #include <grp.h>
 #include <errno.h>
 #endif /* WIN32 */
 
 #include <pwd.h>
 #include <grp.h>
 #include <errno.h>
 #endif /* WIN32 */
 

+

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


@@ -79,19 +83,16 @@ extern int SIZE_BUF;
 #include "gmt2local.h"
 #include "pcap-missing.h"
 
 #include "gmt2local.h"
 #include "pcap-missing.h"
 

+#ifndef NAME_MAX
+#define NAME_MAX 255
+#endif
+

 netdissect_options Gndo;
 netdissect_options *gndo = &Gndo;
 
 netdissect_options Gndo;
 netdissect_options *gndo = &Gndo;
 

-/*
- * Define the maximum number of files for the -C flag, and how many
- * characters can be added to a filename for the -C flag (which
- * should be enough to handle MAX_CFLAG - 1).
- */
-#define MAX_CFLAG      1000000
-#define MAX_CFLAG_CHARS        6
-

 int dflag;                     /* print filter code */
 int Lflag;                     /* list available data link types and exit */
 int dflag;                     /* print filter code */
 int Lflag;                     /* list available data link types and exit */

+char *zflag = NULL;            /* compress each savefile using a specified command (like gzip or bzip2) */

 
 static int infodelay;
 static int infoprint;
 
 static int infodelay;
 static int infoprint;


@@ -102,10 +103,12 @@ int32_t thiszone;         /* seconds offset from gmt to local time */
 
 /* Forwards */
 static RETSIGTYPE cleanup(int);
 
 /* Forwards */
 static RETSIGTYPE cleanup(int);

+static RETSIGTYPE child_cleanup(int);

 static void usage(void) __attribute__((noreturn));
 static void show_dlts_and_exit(pcap_t *pd) __attribute__((noreturn));
 
 static void print_packet(u_char *, const struct pcap_pkthdr *, const u_char *);
 static void usage(void) __attribute__((noreturn));
 static void show_dlts_and_exit(pcap_t *pd) __attribute__((noreturn));
 
 static void print_packet(u_char *, const struct pcap_pkthdr *, const u_char *);

+static void ndo_default_print(netdissect_options *, const u_char *, u_int);

 static void dump_packet_and_trunc(u_char *, const struct pcap_pkthdr *, const u_char *);
 static void dump_packet(u_char *, const struct pcap_pkthdr *, const u_char *);
 static void droproot(const char *, const char *);
 static void dump_packet_and_trunc(u_char *, const struct pcap_pkthdr *, const u_char *);
 static void dump_packet(u_char *, const struct pcap_pkthdr *, const u_char *);
 static void droproot(const char *, const char *);


@@ -189,7 +192,7 @@ static struct printer printers[] = {
 #ifdef DLT_LTALK
        { ltalk_if_print,       DLT_LTALK },
 #endif
 #ifdef DLT_LTALK
        { ltalk_if_print,       DLT_LTALK },
 #endif

-#ifdef DLT_PFLOG
+#if defined(DLT_PFLOG) && defined(HAVE_NET_PFVAR_H)

        { pflog_if_print,       DLT_PFLOG },
 #endif
 #ifdef DLT_FR
        { pflog_if_print,       DLT_PFLOG },
 #endif
 #ifdef DLT_FR


@@ -219,11 +222,59 @@ static struct printer printers[] = {
 #ifdef DLT_APPLE_IP_OVER_IEEE1394
        { ap1394_if_print,      DLT_APPLE_IP_OVER_IEEE1394 },
 #endif
 #ifdef DLT_APPLE_IP_OVER_IEEE1394
        { ap1394_if_print,      DLT_APPLE_IP_OVER_IEEE1394 },
 #endif

+#ifdef DLT_IEEE802_11_RADIO_AVS
+       { ieee802_11_radio_avs_if_print,        DLT_IEEE802_11_RADIO_AVS },
+#endif

 #ifdef DLT_JUNIPER_ATM1
        { juniper_atm1_print,   DLT_JUNIPER_ATM1 },
 #endif
 #ifdef DLT_JUNIPER_ATM2
        { juniper_atm2_print,   DLT_JUNIPER_ATM2 },
 #ifdef DLT_JUNIPER_ATM1
        { juniper_atm1_print,   DLT_JUNIPER_ATM1 },
 #endif
 #ifdef DLT_JUNIPER_ATM2
        { juniper_atm2_print,   DLT_JUNIPER_ATM2 },

+#endif
+#ifdef DLT_JUNIPER_MFR
+       { juniper_mfr_print,    DLT_JUNIPER_MFR },
+#endif
+#ifdef DLT_JUNIPER_MLFR
+       { juniper_mlfr_print,   DLT_JUNIPER_MLFR },
+#endif
+#ifdef DLT_JUNIPER_MLPPP
+       { juniper_mlppp_print,  DLT_JUNIPER_MLPPP },
+#endif
+#ifdef DLT_JUNIPER_PPPOE
+       { juniper_pppoe_print,  DLT_JUNIPER_PPPOE },
+#endif
+#ifdef DLT_JUNIPER_PPPOE_ATM
+       { juniper_pppoe_atm_print, DLT_JUNIPER_PPPOE_ATM },
+#endif
+#ifdef DLT_JUNIPER_GGSN
+       { juniper_ggsn_print,   DLT_JUNIPER_GGSN },
+#endif
+#ifdef DLT_JUNIPER_ES
+       { juniper_es_print,     DLT_JUNIPER_ES },
+#endif
+#ifdef DLT_JUNIPER_MONITOR
+       { juniper_monitor_print, DLT_JUNIPER_MONITOR },
+#endif
+#ifdef DLT_JUNIPER_SERVICES
+       { juniper_services_print, DLT_JUNIPER_SERVICES },
+#endif
+#ifdef DLT_JUNIPER_ETHER
+       { juniper_ether_print, DLT_JUNIPER_ETHER },
+#endif
+#ifdef DLT_JUNIPER_PPP
+       { juniper_ppp_print, DLT_JUNIPER_PPP },
+#endif
+#ifdef DLT_JUNIPER_FRELAY
+       { juniper_frelay_print, DLT_JUNIPER_FRELAY },
+#endif
+#ifdef DLT_JUNIPER_CHDLC
+       { juniper_chdlc_print, DLT_JUNIPER_CHDLC },
+#endif
+#ifdef DLT_MFR
+       { mfr_if_print, DLT_MFR },
+#endif
+#if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H)
+       { bt_if_print, DLT_BLUETOOTH_HCI_H4_WITH_PHDR},

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


@@ -253,6 +304,7 @@ struct print_info {
 
 struct dump_info {
        char    *WFileName;
 
 struct dump_info {
        char    *WFileName;

+       char    *CurrentFileName;

        pcap_t  *pd;
        pcap_dumper_t *p;
 };
        pcap_t  *pd;
        pcap_dumper_t *p;
 };


@@ -282,10 +334,10 @@ show_dlts_and_exit(pcap_t *pd)
                         * OK, does tcpdump handle that type?
                         */
                        if (lookup_printer(dlts[n_dlts]) == NULL)
                         * OK, does tcpdump handle that type?
                         */
                        if (lookup_printer(dlts[n_dlts]) == NULL)

-                               (void) fprintf(stderr, " (not supported)");
+                               (void) fprintf(stderr, " (printing not supported)");

                        putchar('\n');
                } else {
                        putchar('\n');
                } else {

-                       (void) fprintf(stderr, "  DLT %d (not supported)\n",
+                       (void) fprintf(stderr, "  DLT %d (printing not supported)\n",

                            dlts[n_dlts]);
                }
        }
                            dlts[n_dlts]);
                }
        }


@@ -297,13 +349,19 @@ show_dlts_and_exit(pcap_t *pd)
  * Set up flags that might or might not be supported depending on the
  * version of libpcap we're using.
  */
  * Set up flags that might or might not be supported depending on the
  * version of libpcap we're using.
  */

-#ifdef WIN32
+#if defined(HAVE_PCAP_CREATE) || defined(WIN32)

 #define B_FLAG         "B:"
 #define B_FLAG_USAGE   " [ -B size ]"
 #define B_FLAG         "B:"
 #define B_FLAG_USAGE   " [ -B size ]"

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

 #define B_FLAG
 #define B_FLAG_USAGE
 #define B_FLAG
 #define B_FLAG_USAGE

-#endif /* WIN32 */
+#endif /* defined(HAVE_PCAP_CREATE) || defined(WIN32) */
+
+#ifdef HAVE_PCAP_CREATE
+#define I_FLAG         "I"
+#else /* HAVE_PCAP_CREATE */
+#define I_FLAG
+#endif /* HAVE_PCAP_CREATE */

 
 #ifdef HAVE_PCAP_FINDALLDEVS
 #ifndef HAVE_PCAP_IF_T
 
 #ifdef HAVE_PCAP_FINDALLDEVS
 #ifndef HAVE_PCAP_IF_T


@@ -380,10 +438,32 @@ getWflagChars(int x)
 static void
 MakeFilename(char *buffer, char *orig_name, int cnt, int max_chars)
 {
 static void
 MakeFilename(char *buffer, char *orig_name, int cnt, int max_chars)
 {

+        char *filename = malloc(NAME_MAX + 1);
+
+        /* Process with strftime if Gflag is set. */
+        if (Gflag != 0) {
+          struct tm *local_tm;
+
+          /* Convert Gflag_time to a usable format */
+          if ((local_tm = localtime(&Gflag_time)) == NULL) {
+                  error("MakeTimedFilename: localtime");
+          }
+
+          /* There's no good way to detect an error in strftime since a return
+           * value of 0 isn't necessarily failure.
+           */
+          strftime(filename, NAME_MAX, orig_name, local_tm);
+        } else {
+          strncpy(filename, orig_name, NAME_MAX);
+        }
+

        if (cnt == 0 && max_chars == 0)
        if (cnt == 0 && max_chars == 0)

-               strcpy(buffer, orig_name);
+               strncpy(buffer, filename, NAME_MAX + 1);

        else
        else

-               sprintf(buffer, "%s%0*d", orig_name, max_chars, cnt);
+               if (snprintf(buffer, NAME_MAX + 1, "%s%0*d", filename, max_chars, cnt) > NAME_MAX)
+                  /* Report an error if the filename is too large */
+                  error("too many output files or filename is too long (> %d)", NAME_MAX);
+        free(filename);

 }
 
 static int tcpdump_printf(netdissect_options *ndo _U_,
 }
 
 static int tcpdump_printf(netdissect_options *ndo _U_,


@@ -405,7 +485,7 @@ main(int argc, char **argv)
 {
        register int cnt, op, i;
        bpf_u_int32 localnet, netmask;
 {
        register int cnt, op, i;
        bpf_u_int32 localnet, netmask;

-       register char *cp, *infile, *cmdbuf, *device, *RFileName, *WFileName, *WFileNameAlt;
+       register char *cp, *infile, *cmdbuf, *device, *RFileName, *WFileName;

        pcap_handler callback;
        int type;
        struct bpf_program fcode;
        pcap_handler callback;
        int type;
        struct bpf_program fcode;


@@ -424,13 +504,13 @@ main(int argc, char **argv)
 #endif
        int status;
 #ifdef WIN32
 #endif
        int status;
 #ifdef WIN32

-       u_int UserBufferSize = 1000000;

        if(wsockinit() != 0) return 1;
 #endif /* WIN32 */
 
         gndo->ndo_Oflag=1;
        gndo->ndo_Rflag=1;
        gndo->ndo_dlt=-1;
        if(wsockinit() != 0) return 1;
 #endif /* WIN32 */
 
         gndo->ndo_Oflag=1;
        gndo->ndo_Rflag=1;
        gndo->ndo_dlt=-1;

+       gndo->ndo_default_print=ndo_default_print;

        gndo->ndo_printf=tcpdump_printf;
        gndo->ndo_error=ndo_error;
        gndo->ndo_warning=ndo_warning;
        gndo->ndo_printf=tcpdump_printf;
        gndo->ndo_error=ndo_error;
        gndo->ndo_warning=ndo_warning;


@@ -455,7 +535,7 @@ main(int argc, char **argv)
 
        opterr = 0;
        while (
 
        opterr = 0;
        while (

-           (op = getopt(argc, argv, "aA" B_FLAG "c:C:d" D_FLAG "eE:fF:i:lLm:M:nNOpqr:Rs:StT:u" U_FLAG "vw:W:xXy:YZ:")) != -1)
+           (op = getopt(argc, argv, "aA" B_FLAG "c:C:d" D_FLAG "eE:fF:G:i:" I_FLAG "KlLm:M:nNOpqr:Rs:StT:u" U_FLAG "vw:W:xXy:Yz:Z:")) != -1)

                switch (op) {
 
                case 'a':
                switch (op) {
 
                case 'a':


@@ -463,18 +543,19 @@ main(int argc, char **argv)
                        break;
 
                case 'A':
                        break;
 
                case 'A':

-                       ++xflag;
-                       ++Xflag;

                        ++Aflag;
                        break;
                        ++Aflag;
                        break;

+               case 'b':
+                       ++bflag;
+                       break;

 
 

-#ifdef WIN32
+#if defined(HAVE_PCAP_CREATE) || defined(WIN32)

                case 'B':
                case 'B':

-                       UserBufferSize = atoi(optarg)*1024;
-                       if (UserBufferSize < 0)
+                       Bflag = atoi(optarg)*1024;
+                       if (Bflag <= 0)

                                error("invalid packet buffer size %s", optarg);
                        break;
                                error("invalid packet buffer size %s", optarg);
                        break;

-#endif /* WIN32 */
+#endif /* defined(HAVE_PCAP_CREATE) || defined(WIN32) */

 
                case 'c':
                        cnt = atoi(optarg);
 
                case 'c':
                        cnt = atoi(optarg);


@@ -531,6 +612,21 @@ main(int argc, char **argv)
                        infile = optarg;
                        break;
 
                        infile = optarg;
                        break;
 

+               case 'G':
+                       Gflag = atoi(optarg);
+                       if (Gflag < 0)
+                               error("invalid number of seconds %s", optarg);
+
+                        /* We will create one file initially. */
+                        Gflag_count = 0;
+
+                       /* Grab the current time for rotation use. */
+                       if ((Gflag_time = time(NULL)) == (time_t)-1) {
+                               error("main: can't get current time: %s",
+                                   pcap_strerror(errno));
+                       }
+                       break;
+

                case 'i':
                        if (optarg[0] == '0' && optarg[1] == 0)
                                error("Invalid adapter index");
                case 'i':
                        if (optarg[0] == '0' && optarg[1] == 0)
                                error("Invalid adapter index");


@@ -566,6 +662,12 @@ main(int argc, char **argv)
                        device = optarg;
                        break;
 
                        device = optarg;
                        break;
 

+#ifdef HAVE_PCAP_CREATE
+               case 'I':
+                       ++Iflag;
+                       break;
+#endif /* HAVE_PCAP_CREATE */
+

                case 'l':
 #ifdef WIN32
                        /*
                case 'l':
 #ifdef WIN32
                        /*


@@ -587,19 +689,15 @@ main(int argc, char **argv)
 #endif /* WIN32 */
                        break;
 
 #endif /* WIN32 */
                        break;
 

-               case 'n':
-                       ++nflag;
-                       break;
-
-               case 'N':
-                       ++Nflag;
+               case 'K':
+                       ++Kflag;

                        break;
 
                case 'm':
 #ifdef LIBSMI
                        break;
 
                case 'm':
 #ifdef LIBSMI

-                       if (smiLoadModule(optarg) == 0) {
+                       if (smiLoadModule(optarg) == 0) {

                                error("could not load MIB module %s", optarg);
                                error("could not load MIB module %s", optarg);

-                       }
+                       }

                        sflag = 1;
 #else
                        (void)fprintf(stderr, "%s: ignoring option `-m %s' ",
                        sflag = 1;
 #else
                        (void)fprintf(stderr, "%s: ignoring option `-m %s' ",


@@ -613,7 +711,15 @@ main(int argc, char **argv)
 #ifndef HAVE_LIBCRYPTO
                        warning("crypto code not compiled in");
 #endif
 #ifndef HAVE_LIBCRYPTO
                        warning("crypto code not compiled in");
 #endif

-                       tcpmd5secret = optarg;
+                       sigsecret = optarg;
+                       break;
+
+               case 'n':
+                       ++nflag;
+                       break;
+
+               case 'N':
+                       ++Nflag;

                        break;
 
                case 'O':
                        break;
 
                case 'O':


@@ -626,6 +732,7 @@ main(int argc, char **argv)
 
                case 'q':
                        ++qflag;
 
                case 'q':
                        ++qflag;

+                       ++suppress_default_print;

                        break;
 
                case 'r':
                        break;
 
                case 'r':


@@ -641,10 +748,10 @@ main(int argc, char **argv)
 
                        snaplen = strtol(optarg, &end, 0);
                        if (optarg == end || *end != '\0'
 
                        snaplen = strtol(optarg, &end, 0);
                        if (optarg == end || *end != '\0'

-                           || snaplen < 0 || snaplen > 65535)
+                           || snaplen < 0 || snaplen > MAXIMUM_SNAPLEN)

                                error("invalid snaplen %s", optarg);
                        else if (snaplen == 0)
                                error("invalid snaplen %s", optarg);
                        else if (snaplen == 0)

-                               snaplen = 65535;
+                               snaplen = MAXIMUM_SNAPLEN;

                        break;
                }
 
                        break;
                }
 


@@ -706,10 +813,12 @@ main(int argc, char **argv)
 
                case 'x':
                        ++xflag;
 
                case 'x':
                        ++xflag;

+                       ++suppress_default_print;

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

+                       ++suppress_default_print;

                        break;
 
                case 'y':
                        break;
 
                case 'y':


@@ -734,6 +843,15 @@ main(int argc, char **argv)
                        }
                        break;
 #endif
                        }
                        break;
 #endif

+               case 'z':
+                       if (optarg) {
+                               zflag = strdup(optarg);
+                       } else {
+                               usage();
+                               /* NOTREACHED */
+                       }
+                       break;
+

                case 'Z':
                        if (optarg) {
                                username = strdup(optarg);
                case 'Z':
                        if (optarg) {
                                username = strdup(optarg);


@@ -759,10 +877,11 @@ main(int argc, char **argv)
        case 1: /* No time stamp */
        case 2: /* Unix timeval style */
        case 3: /* Microseconds since previous packet */
        case 1: /* No time stamp */
        case 2: /* Unix timeval style */
        case 3: /* Microseconds since previous packet */

+        case 5: /* Microseconds since first packet */

                break;
 
        default: /* Not supported */
                break;
 
        default: /* Not supported */

-               error("only -t, -tt, -ttt, and -tttt are supported");
+               error("only -t, -tt, -ttt, -tttt and -ttttt are supported");

                break;
        }
 
                break;
        }
 


@@ -837,12 +956,74 @@ main(int argc, char **argv)
 
                fflush(stderr); 
 #endif /* WIN32 */
 
                fflush(stderr); 
 #endif /* WIN32 */

+#ifdef HAVE_PCAP_CREATE
+               pd = pcap_create(device, ebuf);
+               if (pd == NULL)
+                       error("%s", ebuf);
+               status = pcap_set_snaplen(pd, snaplen);
+               if (status != 0)
+                       error("%s: pcap_set_snaplen failed: %s",
+                           device, pcap_statustostr(status));
+               status = pcap_set_promisc(pd, !pflag);
+               if (status != 0)
+                       error("%s: pcap_set_promisc failed: %s",
+                           device, pcap_statustostr(status));
+               if (Iflag) {
+                       status = pcap_set_rfmon(pd, 1);
+                       if (status != 0)
+                               error("%s: pcap_set_rfmon failed: %s",
+                                   device, pcap_statustostr(status));
+               }
+               status = pcap_set_timeout(pd, 1000);
+               if (status != 0)
+                       error("%s: pcap_set_timeout failed: %s",
+                           device, pcap_statustostr(status));
+               if (Bflag != 0) {
+                       status = pcap_set_buffer_size(pd, Bflag);
+                       if (status != 0)
+                               error("%s: pcap_set_buffer_size failed: %s",
+                                   device, pcap_statustostr(status));
+               }
+               status = pcap_activate(pd);
+               if (status < 0) {
+                       /*
+                        * pcap_activate() failed.
+                        */
+                       cp = pcap_geterr(pd);
+                       if (status == PCAP_ERROR)
+                               error("%s", cp);
+                       else if ((status == PCAP_ERROR_NO_SUCH_DEVICE ||
+                                 status == PCAP_ERROR_PERM_DENIED) &&
+                                *cp != '\0')
+                               error("%s: %s\n(%s)", device,
+                                   pcap_statustostr(status), cp);
+                       else
+                               error("%s: %s", device,
+                                   pcap_statustostr(status));
+               } else if (status > 0) {
+                       /*
+                        * pcap_activate() succeeded, but it's warning us
+                        * of a problem it had.
+                        */
+                       cp = pcap_geterr(pd);
+                       if (status == PCAP_WARNING)
+                               warning("%s", cp);
+                       else if (status == PCAP_WARNING_PROMISC_NOTSUP &&
+                                *cp != '\0')
+                               warning("%s: %s\n(%s)", device,
+                                   pcap_statustostr(status), cp);
+                       else
+                               warning("%s: %s", device,
+                                   pcap_statustostr(status));
+               }
+#else

                *ebuf = '\0';
                pd = pcap_open_live(device, snaplen, !pflag, 1000, ebuf);
                if (pd == NULL)
                        error("%s", ebuf);
                else if (*ebuf)
                        warning("%s", ebuf);
                *ebuf = '\0';
                pd = pcap_open_live(device, snaplen, !pflag, 1000, ebuf);
                if (pd == NULL)
                        error("%s", ebuf);
                else if (*ebuf)
                        warning("%s", ebuf);

+#endif /* HAVE_PCAP_CREATE */

                /*
                 * Let user own process after socket has been opened.
                 */
                /*
                 * Let user own process after socket has been opened.
                 */


@@ -850,12 +1031,12 @@ main(int argc, char **argv)
                if (setgid(getgid()) != 0 || setuid(getuid()) != 0)
                        fprintf(stderr, "Warning: setgid/setuid failed !\n");
 #endif /* WIN32 */
                if (setgid(getgid()) != 0 || setuid(getuid()) != 0)
                        fprintf(stderr, "Warning: setgid/setuid failed !\n");
 #endif /* WIN32 */

-#ifdef WIN32
-               if(UserBufferSize != 1000000)
-                       if(pcap_setbuff(pd, UserBufferSize)==-1){
+#if !defined(HAVE_PCAP_CREATE) && defined(WIN32)
+               if(Bflag != 0)
+                       if(pcap_setbuff(pd, Bflag)==-1){

                                error("%s", pcap_geterr(pd));
                        }
                                error("%s", pcap_geterr(pd));
                        }

-#endif /* WIN32 */
+#endif /* !defined(HAVE_PCAP_CREATE) && defined(WIN32) */

                if (Lflag)
                        show_dlts_and_exit(pd);
                if (gndo->ndo_dlt >= 0) {
                if (Lflag)
                        show_dlts_and_exit(pd);
                if (gndo->ndo_dlt >= 0) {


@@ -874,7 +1055,7 @@ main(int argc, char **argv)
                        }
 #endif
                        (void)fprintf(stderr, "%s: data link type %s\n",
                        }
 #endif
                        (void)fprintf(stderr, "%s: data link type %s\n",

-                                     program_name, gndo->ndo_dltname);
+                                     program_name, gndo->ndo_dltname);

                        (void)fflush(stderr);
                }
                i = pcap_snapshot(pd);
                        (void)fflush(stderr);
                }
                i = pcap_snapshot(pd);


@@ -901,12 +1082,14 @@ main(int argc, char **argv)
                exit(0);
        }
        init_addrtoname(localnet, netmask);
                exit(0);
        }
        init_addrtoname(localnet, netmask);

+        init_checksum();

 
 #ifndef WIN32  
        (void)setsignal(SIGPIPE, cleanup);
 
 #ifndef WIN32  
        (void)setsignal(SIGPIPE, cleanup);

-#endif /* WIN32 */

        (void)setsignal(SIGTERM, cleanup);
        (void)setsignal(SIGINT, cleanup);
        (void)setsignal(SIGTERM, cleanup);
        (void)setsignal(SIGINT, cleanup);

+       (void)setsignal(SIGCHLD, child_cleanup);
+#endif /* WIN32 */

        /* Cooperate with nohup(1) */
 #ifndef WIN32  
        if ((oldhandler = setsignal(SIGHUP, cleanup)) != SIG_DFL)
        /* Cooperate with nohup(1) */
 #ifndef WIN32  
        if ((oldhandler = setsignal(SIGHUP, cleanup)) != SIG_DFL)


@@ -917,15 +1100,22 @@ main(int argc, char **argv)
                error("%s", pcap_geterr(pd));
        if (WFileName) {
                pcap_dumper_t *p;
                error("%s", pcap_geterr(pd));
        if (WFileName) {
                pcap_dumper_t *p;

+               /* Do not exceed the default NAME_MAX for files. */
+               dumpinfo.CurrentFileName = (char *)malloc(NAME_MAX + 1);
+
+               if (dumpinfo.CurrentFileName == NULL)
+                       error("malloc of dumpinfo.CurrentFileName");

 
 

-               WFileNameAlt = (char *)malloc(strlen(WFileName) + MAX_CFLAG_CHARS + 1);
-               if (WFileNameAlt == NULL)
-                       error("malloc of WFileNameAlt");
-               MakeFilename(WFileNameAlt, WFileName, 0, WflagChars);
-               p = pcap_dump_open(pd, WFileNameAlt);
+               /* We do not need numbering for dumpfiles if Cflag isn't set. */
+               if (Cflag != 0)
+                 MakeFilename(dumpinfo.CurrentFileName, WFileName, 0, WflagChars);
+               else
+                 MakeFilename(dumpinfo.CurrentFileName, WFileName, 0, 0);
+
+               p = pcap_dump_open(pd, dumpinfo.CurrentFileName);

                if (p == NULL)
                        error("%s", pcap_geterr(pd));
                if (p == NULL)
                        error("%s", pcap_geterr(pd));

-               if (Cflag != 0) {
+               if (Cflag != 0 || Gflag != 0) {

                        callback = dump_packet_and_trunc;
                        dumpinfo.WFileName = WFileName;
                        dumpinfo.pd = pd;
                        callback = dump_packet_and_trunc;
                        dumpinfo.WFileName = WFileName;
                        dumpinfo.pd = pd;


@@ -960,7 +1150,12 @@ main(int argc, char **argv)
        }
 #endif /* WIN32 */
 #ifdef SIGINFO
        }
 #endif /* WIN32 */
 #ifdef SIGINFO

-       (void)setsignal(SIGINFO, requestinfo);
+       /*
+        * We can't get statistics when reading from a file rather
+        * than capturing from a device.
+        */
+       if (RFileName == NULL)
+               (void)setsignal(SIGINFO, requestinfo);

 #endif
 
        if (vflag > 0 && WFileName) {
 #endif
 
        if (vflag > 0 && WFileName) {


@@ -1078,6 +1273,18 @@ cleanup(int signo _U_)
 #endif
 }
 
 #endif
 }
 

+/*
+  On windows, we do not use a fork, so we do not care less about
+  waiting a child processes to die
+ */
+#ifndef WIN32
+static RETSIGTYPE
+child_cleanup(int signo _U_)
+{
+  wait(NULL);
+}
+#endif /* WIN32 */
+

 static void
 info(register int verbose)
 {
 static void
 info(register int verbose)
 {


@@ -1085,6 +1292,7 @@ info(register int verbose)
 
        if (pcap_stats(pd, &stat) < 0) {
                (void)fprintf(stderr, "pcap_stats: %s\n", pcap_geterr(pd));
 
        if (pcap_stats(pd, &stat) < 0) {
                (void)fprintf(stderr, "pcap_stats: %s\n", pcap_geterr(pd));

+               infoprint = 0;

                return;
        }
 
                return;
        }
 


@@ -1105,11 +1313,40 @@ info(register int verbose)
        infoprint = 0;
 }
 
        infoprint = 0;
 }
 

+#ifndef WIN32
+static void
+compress_savefile(const char *filename)
+{
+       if (fork())
+               return;
+       /*
+        * Set to lowest priority so that this doesn't disturb the capture
+        */
+#ifdef NZERO
+       setpriority(PRIO_PROCESS, 0, NZERO - 1);
+#else
+       setpriority(PRIO_PROCESS, 0, 19);
+#endif
+       if (execlp(zflag, zflag, filename, NULL) == -1)
+               fprintf(stderr,
+                       "compress_savefile:execlp(%s, %s): %s\n",
+                       zflag,
+                       filename,
+                       strerror(errno));
+}
+#else  /* WIN32 */
+static void
+compress_savefile(const char *filename)
+{
+       fprintf(stderr,
+               "compress_savefile failed. Functionality not implemented under windows\n");
+}
+#endif /* WIN32 */
+

 static void
 dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 {
        struct dump_info *dump_info;
 static void
 dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 {
        struct dump_info *dump_info;

-       char *name;

 
        ++packets_captured;
 
 
        ++packets_captured;
 


@@ -1117,30 +1354,104 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
 
        dump_info = (struct dump_info *)user;
 
 
        dump_info = (struct dump_info *)user;
 

+       /*
+        * XXX - this won't force the file to rotate on the specified time
+        * boundary, but it will rotate on the first packet received after the
+        * specified Gflag number of seconds. Note: if a Gflag time boundary
+        * and a Cflag size boundary coincide, the time rotation will occur
+        * first thereby cancelling the Cflag boundary (since the file should
+        * be 0).
+        */
+       if (Gflag != 0) {
+               /* Check if it is time to rotate */
+               time_t t;
+
+               /* Get the current time */
+               if ((t = time(NULL)) == (time_t)-1) {
+                       error("dump_and_trunc_packet: can't get current_time: %s",
+                           pcap_strerror(errno));
+               }
+
+
+               /* If the time is greater than the specified window, rotate */
+               if (t - Gflag_time >= Gflag) {
+                       /* Update the Gflag_time */
+                       Gflag_time = t;
+                       /* Update Gflag_count */
+                       Gflag_count++;
+                       /*
+                        * Close the current file and open a new one.
+                        */
+                       pcap_dump_close(dump_info->p);
+
+                       /*
+                        * Compress the file we just closed, if the user asked for it
+                        */
+                       if (zflag != NULL)
+                               compress_savefile(dump_info->CurrentFileName);
+
+                       /*
+                        * Check to see if we've exceeded the Wflag (when
+                        * not using Cflag).
+                        */
+                       if (Cflag == 0 && Wflag > 0 && Gflag_count >= Wflag) {
+                               (void)fprintf(stderr, "Maximum file limit reached: %d\n",
+                                   Wflag);
+                               exit(0);
+                               /* NOTREACHED */
+                       }
+                       if (dump_info->CurrentFileName != NULL)
+                               free(dump_info->CurrentFileName);
+                       /* Allocate space for max filename + \0. */
+                       dump_info->CurrentFileName = (char *)malloc(NAME_MAX + 1);
+                       if (dump_info->CurrentFileName == NULL)
+                               error("dump_packet_and_trunc: malloc");
+                       /*
+                        * This is always the first file in the Cflag
+                        * rotation: e.g. 0
+                        * We also don't need numbering if Cflag is not set.
+                        */
+                       if (Cflag != 0)
+                               MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, 0,
+                                   WflagChars);
+                       else
+                               MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, 0, 0);
+
+                       dump_info->p = pcap_dump_open(dump_info->pd, dump_info->CurrentFileName);
+                       if (dump_info->p == NULL)
+                               error("%s", pcap_geterr(pd));
+               }
+       }
+

        /*
         * XXX - this won't prevent capture files from getting
         * larger than Cflag - the last packet written to the
         * file could put it over Cflag.
         */
        /*
         * XXX - this won't prevent capture files from getting
         * larger than Cflag - the last packet written to the
         * file could put it over Cflag.
         */

-       if (ftell((FILE *)dump_info->p) > Cflag) {
+       if (Cflag != 0 && pcap_dump_ftell(dump_info->p) > Cflag) {

                /*
                 * Close the current file and open a new one.
                 */
                pcap_dump_close(dump_info->p);
                /*
                 * Close the current file and open a new one.
                 */
                pcap_dump_close(dump_info->p);

+
+               /*
+                * Compress the file we just closed, if the user asked for it
+                */
+               if (zflag != NULL)
+                       compress_savefile(dump_info->CurrentFileName);
+

                Cflag_count++;
                if (Wflag > 0) {
                        if (Cflag_count >= Wflag)
                                Cflag_count = 0;
                Cflag_count++;
                if (Wflag > 0) {
                        if (Cflag_count >= Wflag)
                                Cflag_count = 0;

-               } else {
-                       if (Cflag_count >= MAX_CFLAG)
-                               error("too many output files");

                }
                }

-               name = (char *)malloc(strlen(dump_info->WFileName) + MAX_CFLAG_CHARS + 1);
-               if (name == NULL)
+               if (dump_info->CurrentFileName != NULL)
+                       free(dump_info->CurrentFileName);
+               dump_info->CurrentFileName = (char *)malloc(NAME_MAX + 1);
+               if (dump_info->CurrentFileName == NULL)

                        error("dump_packet_and_trunc: malloc");
                        error("dump_packet_and_trunc: malloc");

-               MakeFilename(name, dump_info->WFileName, Cflag_count, WflagChars);
-               dump_info->p = pcap_dump_open(dump_info->pd, name);
-               free(name);
+               MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, Cflag_count, WflagChars);
+               dump_info->p = pcap_dump_open(dump_info->pd, dump_info->CurrentFileName);

                if (dump_info->p == NULL)
                        error("%s", pcap_geterr(pd));
        }
                if (dump_info->p == NULL)
                        error("%s", pcap_geterr(pd));
        }


@@ -1195,9 +1506,28 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
        snapend = sp + h->caplen;
 
        hdrlen = (*print_info->printer)(h, sp);
        snapend = sp + h->caplen;
 
        hdrlen = (*print_info->printer)(h, sp);

-       if (xflag) {
+       if (Xflag) {

                /*
                /*

-                * Print the raw packet data.
+                * Print the raw packet data in hex and ASCII.
+                */
+               if (Xflag > 1) {
+                       /*
+                        * Include the link-layer header.
+                        */
+                       hex_and_ascii_print("\n\t", sp, h->caplen);
+               } else {
+                       /*
+                        * Don't include the link-layer header - and if
+                        * we have nothing past the link-layer header,
+                        * print nothing.
+                        */
+                       if (h->caplen > hdrlen)
+                               hex_and_ascii_print("\n\t", sp + hdrlen,
+                                   h->caplen - hdrlen);
+               }
+       } else if (xflag) {
+               /*
+                * Print the raw packet data in hex.

                 */
                if (xflag > 1) {
                        /*
                 */
                if (xflag > 1) {
                        /*


@@ -1214,15 +1544,15 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
                                hex_print("\n\t", sp + hdrlen,
                                    h->caplen - hdrlen);
                }
                                hex_print("\n\t", sp + hdrlen,
                                    h->caplen - hdrlen);
                }

-       } else if (Xflag) {
+       } else if (Aflag) {

                /*
                /*

-                * Print the raw packet data.
+                * Print the raw packet data in ASCII.

                 */
                 */

-               if (Xflag > 1) {
+               if (Aflag > 1) {

                        /*
                         * Include the link-layer header.
                         */
                        /*
                         * Include the link-layer header.
                         */

-                       ascii_print("\n\t", sp, h->caplen);
+                       ascii_print(sp, h->caplen);

                } else {
                        /*
                         * Don't include the link-layer header - and if
                } else {
                        /*
                         * Don't include the link-layer header - and if


@@ -1230,8 +1560,7 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
                         * print nothing.
                         */
                        if (h->caplen > hdrlen)
                         * print nothing.
                         */
                        if (h->caplen > hdrlen)

-                               ascii_print("\n\t", sp + hdrlen,
-                                   h->caplen - hdrlen);
+                               ascii_print(sp + hdrlen, h->caplen - hdrlen);

                }
        }
 
                }
        }
 


@@ -1270,12 +1599,18 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 #endif
 
 /*
 #endif
 
 /*

- * By default, print the specified data out in hex.
+ * By default, print the specified data out in hex and ASCII.

  */
  */

+static void
+ndo_default_print(netdissect_options *ndo _U_, const u_char *bp, u_int length)
+{
+       hex_and_ascii_print("\n\t", bp, length); /* pass on lf and identation string */
+}
+

 void
 void

-default_print(register const u_char *bp, register u_int length)
+default_print(const u_char *bp, u_int length)

 {
 {

-       ascii_print("\n\t", bp, length); /* pass on lf and identation string */
+       ndo_default_print(gndo, bp, length);

 }
 
 #ifdef SIGINFO
 }
 
 #ifdef SIGINFO


@@ -1293,7 +1628,7 @@ RETSIGTYPE requestinfo(int signo _U_)
  */
 #ifdef USE_WIN32_MM_TIMER
 void CALLBACK verbose_stats_dump (UINT timer_id _U_, UINT msg _U_, DWORD_PTR arg _U_,
  */
 #ifdef USE_WIN32_MM_TIMER
 void CALLBACK verbose_stats_dump (UINT timer_id _U_, UINT msg _U_, DWORD_PTR arg _U_,

-                                  DWORD_PTR dw1 _U_, DWORD_PTR dw2 _U_)
+                                 DWORD_PTR dw1 _U_, DWORD_PTR dw2 _U_)

 {
        struct pcap_stat stat;
 
 {
        struct pcap_stat stat;
 


@@ -1340,13 +1675,15 @@ usage(void)
 #endif /* WIN32 */
 #endif /* HAVE_PCAP_LIB_VERSION */
        (void)fprintf(stderr,
 #endif /* WIN32 */
 #endif /* HAVE_PCAP_LIB_VERSION */
        (void)fprintf(stderr,

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

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

-"\t\t[ -E algo:secret ] [ -F file ] [ -i interface ] [ -M secret ]\n");
+"\t\t[ -C file_size ] [ -E algo:secret ] [ -F file ] [ -G seconds ]\n");

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

-"\t\t[ -r file ] [ -s snaplen ] [ -T type ] [ -w file ]\n");
+"\t\t[ -i interface ] [ -M secret ] [ -r file ]\n");

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

-"\t\t[ -W filecount ] [ -y datalinktype ] [ -Z user ]\n");
+"\t\t[ -s snaplen ] [ -T type ] [ -w file ] [ -W filecount ]\n");
+       (void)fprintf(stderr,
+"\t\t[ -y datalinktype ] [ -z command ] [ -Z user ]\n");

        (void)fprintf(stderr,
 "\t\t[ expression ]\n");
        exit(1);
        (void)fprintf(stderr,
 "\t\t[ expression ]\n");
        exit(1);


@@ -1389,4 +1726,3 @@ ndo_warning(netdissect_options *ndo _U_, const char *fmt, ...)
                        (void)fputc('\n', stderr);
        }
 }
                        (void)fputc('\n', stderr);
        }
 }

-