]> The Tcpdump Group git mirrors - tcpdump/blobdiff - tcpdump.c
Don't accept zero -C or -W options
[tcpdump] / tcpdump.c
index 0d58e9d8788067b4c24e36d8fdf60261464d0be7..282d44c96ffa88a3d3467101aa9cc63147cc7eae 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -32,7 +32,7 @@ The Regents of the University of California.  All rights reserved.\n";
 #endif
 
 /*
- * tcpdump - monitor tcp/ip traffic on an ethernet.
+ * tcpdump - dump traffic on a network
  *
  * First written in 1987 by Van Jacobson, Lawrence Berkeley Laboratory.
  * Mercilessly hacked and occasionally improved since then via the
@@ -54,15 +54,7 @@ The Regents of the University of California.  All rights reserved.\n";
 #endif
 #endif
 
-#include <tcpdump-stdinc.h>
-
-#ifdef WIN32
-#include "w32_fzs.h"
-extern int strcasecmp (const char *__s1, const char *__s2);
-extern int SIZE_BUF;
-#define off_t long
-#define uint UINT
-#endif /* WIN32 */
+#include <netdissect-stdinc.h>
 
 #ifdef USE_LIBSMI
 #include <smi.h>
@@ -94,12 +86,12 @@ extern int SIZE_BUF;
 #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>
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 /* capabilities convenience library */
 /* If a code depends on HAVE_LIBCAP_NG, it depends also on HAVE_CAP_NG_H.
@@ -121,6 +113,7 @@ extern int SIZE_BUF;
 #include "setsignal.h"
 #include "gmt2local.h"
 #include "pcap-missing.h"
+#include "ascii_strcasecmp.h"
 
 #include "print.h"
 
@@ -137,7 +130,19 @@ extern int SIZE_BUF;
 static int Cflag;                      /* rotate dump files after this many bytes */
 static int Cflag_count;                        /* Keep track of which file number we're writing */
 static int Dflag;                      /* list available devices and exit */
-static int dflag;                      /* print filter code */
+/*
+ * This is exported because, in some versions of libpcap, if libpcap
+ * is built with optimizer debugging code (which is *NOT* the default
+ * configuration!), the library *imports*(!) a variable named dflag,
+ * under the expectation that tcpdump is exporting it, to govern
+ * how much debugging information to print when optimizing
+ * the generated BPF code.
+ *
+ * This is a horrible hack; newer versions of libpcap don't import
+ * dflag but, instead, *if* built with optimizer debugging code,
+ * *export* a routine to set that flag.
+ */
+int dflag;                             /* print filter code */
 static int Gflag;                      /* rotate dump files after this many seconds */
 static int Gflag_count;                        /* number of files created with Gflag rotation */
 static time_t Gflag_time;              /* The last time_t the dump file was rotated. */
@@ -164,7 +169,8 @@ static RETSIGTYPE cleanup(int);
 static RETSIGTYPE child_cleanup(int);
 static void print_version(void);
 static void print_usage(void);
-static void show_dlts_and_exit(const char *device, pcap_t *pd) __attribute__((noreturn));
+static void show_tstamp_types_and_exit(const char *device) __attribute__((noreturn));
+static void show_dlts_and_exit(const char *device) __attribute__((noreturn));
 
 static void print_packet(u_char *, const struct pcap_pkthdr *, const u_char *);
 static void dump_packet_and_trunc(u_char *, const struct pcap_pkthdr *, const u_char *);
@@ -215,9 +221,60 @@ struct dump_info {
 #endif
 };
 
+#if defined(HAVE_PCAP_SET_PARSER_DEBUG)
+/*
+ * We have pcap_set_parser_debug() in libpcap; declare it (it's not declared
+ * by any libpcap header, because it's a special hack, only available if
+ * libpcap was configured to include it, and only intended for use by
+ * libpcap developers trying to debug the parser for filter expressions).
+ */
+#ifdef _WIN32
+__declspec(dllimport)
+#else /* _WIN32 */
+extern
+#endif /* _WIN32 */
+void pcap_set_parser_debug(int);
+#elif defined(HAVE_PCAP_DEBUG) || defined(HAVE_YYDEBUG)
+/*
+ * We don't have pcap_set_parser_debug() in libpcap, but we do have
+ * pcap_debug or yydebug.  Make a local version of pcap_set_parser_debug()
+ * to set the flag, and define HAVE_PCAP_SET_PARSER_DEBUG.
+ */
+static void
+pcap_set_parser_debug(int value)
+{
+#ifdef HAVE_PCAP_DEBUG
+       extern int pcap_debug;
+
+       pcap_debug = value;
+#else /* HAVE_PCAP_DEBUG */
+       extern int yydebug;
+
+       yydebug = value;
+#endif /* HAVE_PCAP_DEBUG */
+}
+
+#define HAVE_PCAP_SET_PARSER_DEBUG
+#endif
+
+#if defined(HAVE_PCAP_SET_OPTIMIZER_DEBUG)
+/*
+ * We have pcap_set_optimizer_debug() in libpcap; declare it (it's not declared
+ * by any libpcap header, because it's a special hack, only available if
+ * libpcap was configured to include it, and only intended for use by
+ * libpcap developers trying to debug the optimizer for filter expressions).
+ */
+#ifdef _WIN32
+__declspec(dllimport)
+#else /* _WIN32 */
+extern
+#endif /* _WIN32 */
+void pcap_set_optimizer_debug(int);
+#endif
+
 #ifdef HAVE_PCAP_SET_TSTAMP_TYPE
 static void
-show_tstamp_types_and_exit(const char *device, pcap_t *pd)
+show_tstamp_types_and_exit(const char *device)
 {
        int n_tstamp_types;
        int *tstamp_types = 0;
@@ -250,7 +307,7 @@ show_tstamp_types_and_exit(const char *device, pcap_t *pd)
 #endif
 
 static void
-show_dlts_and_exit(const char *device, pcap_t *pd)
+show_dlts_and_exit(const char *device)
 {
        int n_dlts, i;
        int *dlts = 0;
@@ -305,23 +362,21 @@ show_dlts_and_exit(const char *device, pcap_t *pd)
 static void
 show_devices_and_exit (void)
 {
-       pcap_if_t *devpointer;
+       pcap_if_t *dev, *devlist;
        char ebuf[PCAP_ERRBUF_SIZE];
        int i;
 
-       if (pcap_findalldevs(&devpointer, ebuf) < 0)
+       if (pcap_findalldevs(&devlist, ebuf) < 0)
                error("%s", ebuf);
-       else {
-               for (i = 0; devpointer != NULL; i++) {
-                       printf("%d.%s", i+1, devpointer->name);
-                       if (devpointer->description != NULL)
-                               printf(" (%s)", devpointer->description);
-                       if (devpointer->flags != 0)
-                               printf(" [%s]", bittok2str(status_flags, "none", devpointer->flags));
-                       printf("\n");
-                       devpointer = devpointer->next;
-               }
+       for (i = 0, dev = devlist; dev != NULL; i++, dev = dev->next) {
+               printf("%d.%s", i+1, dev->name);
+               if (dev->description != NULL)
+                       printf(" (%s)", dev->description);
+               if (dev->flags != 0)
+                       printf(" [%s]", bittok2str(status_flags, "none", dev->flags));
+               printf("\n");
        }
+       pcap_freealldevs(devlist);
        exit(0);
 }
 #endif /* HAVE_PCAP_FINDALLDEVS */
@@ -360,13 +415,13 @@ show_devices_and_exit (void)
  * Set up flags that might or might not be supported depending on the
  * version of libpcap we're using.
  */
-#if defined(HAVE_PCAP_CREATE) || defined(WIN32)
+#if defined(HAVE_PCAP_CREATE) || defined(_WIN32)
 #define B_FLAG         "B:"
 #define B_FLAG_USAGE   " [ -B size ]"
-#else /* defined(HAVE_PCAP_CREATE) || defined(WIN32) */
+#else /* defined(HAVE_PCAP_CREATE) || defined(_WIN32) */
 #define B_FLAG
 #define B_FLAG_USAGE
-#endif /* defined(HAVE_PCAP_CREATE) || defined(WIN32) */
+#endif /* defined(HAVE_PCAP_CREATE) || defined(_WIN32) */
 
 #ifdef HAVE_PCAP_CREATE
 #define I_FLAG         "I"
@@ -402,7 +457,7 @@ show_devices_and_exit (void)
 #define Q_FLAG
 #endif
 
-#define SHORTOPTS "aAb" B_FLAG "c:C:d" D_FLAG "eE:fF:G:hHi:" I_FLAG j_FLAG J_FLAG "KlLm:M:nNOpq" Q_FLAG "r:Rs:StT:u" U_FLAG "vV:w:W:xXy:Yz:Z:#"
+#define SHORTOPTS "aAb" B_FLAG "c:C:d" D_FLAG "eE:fF:G:hHi:" I_FLAG j_FLAG J_FLAG "KlLm:M:nNOpq" Q_FLAG "r:s:StT:u" U_FLAG "vV:w:W:xXy:Yz:Z:#"
 
 /*
  * Long options.
@@ -429,7 +484,7 @@ show_devices_and_exit (void)
 #define OPTION_IMMEDIATE_MODE  130
 
 static const struct option longopts[] = {
-#if defined(HAVE_PCAP_CREATE) || defined(WIN32)
+#if defined(HAVE_PCAP_CREATE) || defined(_WIN32)
        { "buffer-size", required_argument, NULL, 'B' },
 #endif
        { "list-interfaces", no_argument, NULL, 'D' },
@@ -461,7 +516,7 @@ static const struct option longopts[] = {
 #ifdef HAVE_PCAP_SET_IMMEDIATE_MODE
        { "immediate-mode", no_argument, NULL, OPTION_IMMEDIATE_MODE },
 #endif
-#if defined(HAVE_PCAP_DEBUG) || defined(HAVE_YYDEBUG)
+#ifdef HAVE_PCAP_SET_PARSER_DEBUG
        { "debug-filter-parser", no_argument, NULL, 'Y' },
 #endif
        { "relinquish-privileges", required_argument, NULL, 'Z' },
@@ -470,7 +525,7 @@ static const struct option longopts[] = {
        { NULL, 0, NULL, 0 }
 };
 
-#ifndef WIN32
+#ifndef _WIN32
 /* Drop root privileges and chroot if necessary */
 static void
 droproot(const char *username, const char *chroot_dir)
@@ -478,7 +533,8 @@ droproot(const char *username, const char *chroot_dir)
        struct passwd *pw = NULL;
 
        if (chroot_dir && !username) {
-               fprintf(stderr, "tcpdump: Chroot without dropping root is insecure\n");
+               fprintf(stderr, "%s: Chroot without dropping root is insecure\n",
+                       program_name);
                exit(1);
        }
 
@@ -486,27 +542,28 @@ droproot(const char *username, const char *chroot_dir)
        if (pw) {
                if (chroot_dir) {
                        if (chroot(chroot_dir) != 0 || chdir ("/") != 0) {
-                               fprintf(stderr, "tcpdump: Couldn't chroot/chdir to '%.64s': %s\n",
-                                   chroot_dir, pcap_strerror(errno));
+                               fprintf(stderr, "%s: Couldn't chroot/chdir to '%.64s': %s\n",
+                                       program_name, chroot_dir, pcap_strerror(errno));
                                exit(1);
                        }
                }
 #ifdef HAVE_LIBCAP_NG
-               int ret = capng_change_id(pw->pw_uid, pw->pw_gid, CAPNG_NO_FLAG);
-               if (ret < 0) {
-                       fprintf(stderr, "error : ret %d\n", ret);
-               }
-               else {
-                       fprintf(stderr, "dropped privs to %s\n", username);
+               {
+                       int ret = capng_change_id(pw->pw_uid, pw->pw_gid, CAPNG_NO_FLAG);
+                       if (ret < 0) {
+                               fprintf(stderr, "error : ret %d\n", ret);
+                       } else {
+                               fprintf(stderr, "dropped privs to %s\n", username);
+                       }
                }
 #else
                if (initgroups(pw->pw_name, pw->pw_gid) != 0 ||
                    setgid(pw->pw_gid) != 0 || setuid(pw->pw_uid) != 0) {
-                       fprintf(stderr, "tcpdump: Couldn't change to '%.32s' uid=%lu gid=%lu: %s\n",
-                           username,
-                           (unsigned long)pw->pw_uid,
-                           (unsigned long)pw->pw_gid,
-                           pcap_strerror(errno));
+                       fprintf(stderr, "%s: Couldn't change to '%.32s' uid=%lu gid=%lu: %s\n",
+                               program_name, username,
+                               (unsigned long)pw->pw_uid,
+                               (unsigned long)pw->pw_gid,
+                               pcap_strerror(errno));
                        exit(1);
                }
                else {
@@ -515,8 +572,8 @@ droproot(const char *username, const char *chroot_dir)
 #endif /* HAVE_LIBCAP_NG */
        }
        else {
-               fprintf(stderr, "tcpdump: Couldn't find user '%.32s'\n",
-                   username);
+               fprintf(stderr, "%s: Couldn't find user '%.32s'\n",
+                       program_name, username);
                exit(1);
        }
 #ifdef HAVE_LIBCAP_NG
@@ -531,7 +588,7 @@ droproot(const char *username, const char *chroot_dir)
 #endif /* HAVE_LIBCAP_NG */
 
 }
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 static int
 getWflagChars(int x)
@@ -704,15 +761,12 @@ main(int argc, char **argv)
        int timezone_offset = 0;
        register char *cp, *infile, *cmdbuf, *device, *RFileName, *VFileName, *WFileName;
        pcap_handler callback;
-       int type;
        int dlt;
-       int new_dlt;
        const char *dlt_name;
        struct bpf_program fcode;
-#ifndef WIN32
+#ifndef _WIN32
        RETSIGTYPE (*oldhandler)(int);
 #endif
-       struct print_info printinfo;
        struct dump_info dumpinfo;
        u_char *pcap_userdata;
        char ebuf[PCAP_ERRBUF_SIZE];
@@ -722,7 +776,7 @@ main(int argc, char **argv)
        char *ret = NULL;
        char *end;
 #ifdef HAVE_PCAP_FINDALLDEVS
-       pcap_if_t *devpointer;
+       pcap_if_t *dev, *devlist;
        int devnum;
 #endif
        int status;
@@ -731,23 +785,20 @@ main(int argc, char **argv)
        cap_rights_t rights;
        int cansandbox;
 #endif /* HAVE_CAPSICUM */
-       int Bflag=0;                    /* buffer size */
-       int jflag=-1;                   /* packet time stamp source */
-       int Oflag=1;                    /* run filter code optimizer */
-       int pflag=0;                    /* don't go promiscuous */
-       netdissect_options Gndo;
-       netdissect_options *gndo = &Gndo;
-
-#ifdef WIN32
-       if(wsockinit() != 0) return 1;
-#endif /* WIN32 */
-
-       memset(gndo, 0, sizeof(*gndo));
-       gndo->ndo_Rflag=1;
-       gndo->ndo_dlt=-1;
-       ndo_set_function_pointers(gndo);
-       gndo->ndo_snaplen = DEFAULT_SNAPLEN;
-       gndo->ndo_immediate = 0;
+       int Bflag = 0;                  /* buffer size */
+       int jflag = -1;                 /* packet time stamp source */
+       int Oflag = 1;                  /* run filter code optimizer */
+       int pflag = 0;                  /* don't go promiscuous */
+       int yflag_dlt = -1;
+       const char *yflag_dlt_name = NULL;
+
+       netdissect_options Ndo;
+       netdissect_options *ndo = &Ndo;
+       int immediate_mode = 0;
+
+       memset(ndo, 0, sizeof(*ndo));
+       ndo_set_function_pointers(ndo);
+       ndo->ndo_snaplen = DEFAULT_SNAPLEN;
 
        cnt = -1;
        device = NULL;
@@ -758,9 +809,14 @@ main(int argc, char **argv)
        WFileName = NULL;
        dlt = -1;
        if ((cp = strrchr(argv[0], '/')) != NULL)
-               program_name = cp + 1;
+               ndo->program_name = program_name = cp + 1;
        else
-               program_name = argv[0];
+               ndo->program_name = program_name = argv[0];
+
+#ifdef _WIN32
+       if (pcap_wsockinit() != 0)
+               error("Attempting to initialize Winsock failed");
+#endif /* _WIN32 */
 
        /*
         * On platforms where the CPU doesn't support unaligned loads,
@@ -785,20 +841,20 @@ main(int argc, char **argv)
                        break;
 
                case 'A':
-                       ++gndo->ndo_Aflag;
+                       ++ndo->ndo_Aflag;
                        break;
 
                case 'b':
-                       ++gndo->ndo_bflag;
+                       ++ndo->ndo_bflag;
                        break;
 
-#if defined(HAVE_PCAP_CREATE) || defined(WIN32)
+#if defined(HAVE_PCAP_CREATE) || defined(_WIN32)
                case 'B':
                        Bflag = atoi(optarg)*1024;
                        if (Bflag <= 0)
                                error("invalid packet buffer size %s", optarg);
                        break;
-#endif /* defined(HAVE_PCAP_CREATE) || defined(WIN32) */
+#endif /* defined(HAVE_PCAP_CREATE) || defined(_WIN32) */
 
                case 'c':
                        cnt = atoi(optarg);
@@ -808,7 +864,7 @@ main(int argc, char **argv)
 
                case 'C':
                        Cflag = atoi(optarg) * 1000000;
-                       if (Cflag < 0)
+                       if (Cflag <= 0)
                                error("invalid file size %s", optarg);
                        break;
 
@@ -825,18 +881,18 @@ main(int argc, char **argv)
                        break;
 
                case 'e':
-                       ++gndo->ndo_eflag;
+                       ++ndo->ndo_eflag;
                        break;
 
                case 'E':
 #ifndef HAVE_LIBCRYPTO
                        warning("crypto code not compiled in");
 #endif
-                       gndo->ndo_espsecret = optarg;
+                       ndo->ndo_espsecret = optarg;
                        break;
 
                case 'f':
-                       ++gndo->ndo_fflag;
+                       ++ndo->ndo_fflag;
                        break;
 
                case 'F':
@@ -864,7 +920,7 @@ main(int argc, char **argv)
                        break;
 
                case 'H':
-                       ++gndo->ndo_Hflag;
+                       ++ndo->ndo_Hflag;
                        break;
 
                case 'i':
@@ -887,22 +943,20 @@ main(int argc, char **argv)
                                if (devnum < 0)
                                        error("Invalid adapter index");
 
-                               if (pcap_findalldevs(&devpointer, ebuf) < 0)
+                               if (pcap_findalldevs(&devlist, ebuf) < 0)
                                        error("%s", ebuf);
-                               else {
-                                       /*
-                                        * Look for the devnum-th entry
-                                        * in the list of devices
-                                        * (1-based).
-                                        */
-                                       for (i = 0;
-                                           i < devnum-1 && devpointer != NULL;
-                                           i++, devpointer = devpointer->next)
-                                               ;
-                                       if (devpointer == NULL)
-                                               error("Invalid adapter index");
-                               }
-                               device = devpointer->name;
+                               /*
+                                * Look for the devnum-th entry in the
+                                * list of devices (1-based).
+                                */
+                               for (i = 0, dev = devlist;
+                                   i < devnum-1 && dev != NULL;
+                                   i++, dev = dev->next)
+                                       ;
+                               if (dev == NULL)
+                                       error("Invalid adapter index");
+                               device = strdup(dev->name);
+                               pcap_freealldevs(devlist);
                                break;
                        }
 #endif /* HAVE_PCAP_FINDALLDEVS */
@@ -928,28 +982,28 @@ main(int argc, char **argv)
 #endif
 
                case 'l':
-#ifdef WIN32
+#ifdef _WIN32
                        /*
                         * _IOLBF is the same as _IOFBF in Microsoft's C
                         * libraries; the only alternative they offer
                         * is _IONBF.
                         *
                         * XXX - this should really be checking for MSVC++,
-                        * not WIN32, if, for example, MinGW has its own
+                        * not _WIN32, if, for example, MinGW has its own
                         * C library that is more UNIX-compatible.
                         */
                        setvbuf(stdout, NULL, _IONBF, 0);
-#else /* WIN32 */
+#else /* _WIN32 */
 #ifdef HAVE_SETLINEBUF
                        setlinebuf(stdout);
 #else
                        setvbuf(stdout, NULL, _IOLBF, 0);
 #endif
-#endif /* WIN32 */
+#endif /* _WIN32 */
                        break;
 
                case 'K':
-                       ++gndo->ndo_Kflag;
+                       ++ndo->ndo_Kflag;
                        break;
 
                case 'm':
@@ -957,7 +1011,7 @@ main(int argc, char **argv)
                        if (smiLoadModule(optarg) == 0) {
                                error("could not load MIB module %s", optarg);
                        }
-                       gndo->ndo_sflag = 1;
+                       ndo->ndo_mflag = 1;
 #else
                        (void)fprintf(stderr, "%s: ignoring option `-m %s' ",
                                      program_name, optarg);
@@ -970,15 +1024,15 @@ main(int argc, char **argv)
 #ifndef HAVE_LIBCRYPTO
                        warning("crypto code not compiled in");
 #endif
-                       gndo->ndo_sigsecret = optarg;
+                       ndo->ndo_sigsecret = optarg;
                        break;
 
                case 'n':
-                       ++gndo->ndo_nflag;
+                       ++ndo->ndo_nflag;
                        break;
 
                case 'N':
-                       ++gndo->ndo_Nflag;
+                       ++ndo->ndo_Nflag;
                        break;
 
                case 'O':
@@ -990,17 +1044,17 @@ main(int argc, char **argv)
                        break;
 
                case 'q':
-                       ++gndo->ndo_qflag;
-                       ++gndo->ndo_suppress_default_print;
+                       ++ndo->ndo_qflag;
+                       ++ndo->ndo_suppress_default_print;
                        break;
 
 #ifdef HAVE_PCAP_SETDIRECTION
                case 'Q':
-                       if (strcasecmp(optarg, "in") == 0)
+                       if (ascii_strcasecmp(optarg, "in") == 0)
                                Qflag = PCAP_D_IN;
-                       else if (strcasecmp(optarg, "out") == 0)
+                       else if (ascii_strcasecmp(optarg, "out") == 0)
                                Qflag = PCAP_D_OUT;
-                       else if (strcasecmp(optarg, "inout") == 0)
+                       else if (ascii_strcasecmp(optarg, "inout") == 0)
                                Qflag = PCAP_D_INOUT;
                        else
                                error("unknown capture direction `%s'", optarg);
@@ -1011,66 +1065,64 @@ main(int argc, char **argv)
                        RFileName = optarg;
                        break;
 
-               case 'R':
-                       gndo->ndo_Rflag = 0;
-                       break;
-
                case 's':
-                       gndo->ndo_snaplen = strtol(optarg, &end, 0);
+                       ndo->ndo_snaplen = strtol(optarg, &end, 0);
                        if (optarg == end || *end != '\0'
-                           || gndo->ndo_snaplen < 0 || gndo->ndo_snaplen > MAXIMUM_SNAPLEN)
+                           || ndo->ndo_snaplen < 0 || ndo->ndo_snaplen > MAXIMUM_SNAPLEN)
                                error("invalid snaplen %s", optarg);
-                       else if (gndo->ndo_snaplen == 0)
-                               gndo->ndo_snaplen = MAXIMUM_SNAPLEN;
+                       else if (ndo->ndo_snaplen == 0)
+                               ndo->ndo_snaplen = MAXIMUM_SNAPLEN;
                        break;
 
                case 'S':
-                       ++gndo->ndo_Sflag;
+                       ++ndo->ndo_Sflag;
                        break;
 
                case 't':
-                       ++gndo->ndo_tflag;
+                       ++ndo->ndo_tflag;
                        break;
 
                case 'T':
-                       if (strcasecmp(optarg, "vat") == 0)
-                               gndo->ndo_packettype = PT_VAT;
-                       else if (strcasecmp(optarg, "wb") == 0)
-                               gndo->ndo_packettype = PT_WB;
-                       else if (strcasecmp(optarg, "rpc") == 0)
-                               gndo->ndo_packettype = PT_RPC;
-                       else if (strcasecmp(optarg, "rtp") == 0)
-                               gndo->ndo_packettype = PT_RTP;
-                       else if (strcasecmp(optarg, "rtcp") == 0)
-                               gndo->ndo_packettype = PT_RTCP;
-                       else if (strcasecmp(optarg, "snmp") == 0)
-                               gndo->ndo_packettype = PT_SNMP;
-                       else if (strcasecmp(optarg, "cnfp") == 0)
-                               gndo->ndo_packettype = PT_CNFP;
-                       else if (strcasecmp(optarg, "tftp") == 0)
-                               gndo->ndo_packettype = PT_TFTP;
-                       else if (strcasecmp(optarg, "aodv") == 0)
-                               gndo->ndo_packettype = PT_AODV;
-                       else if (strcasecmp(optarg, "carp") == 0)
-                               gndo->ndo_packettype = PT_CARP;
-                       else if (strcasecmp(optarg, "radius") == 0)
-                               gndo->ndo_packettype = PT_RADIUS;
-                       else if (strcasecmp(optarg, "zmtp1") == 0)
-                               gndo->ndo_packettype = PT_ZMTP1;
-                       else if (strcasecmp(optarg, "vxlan") == 0)
-                               gndo->ndo_packettype = PT_VXLAN;
-                       else if (strcasecmp(optarg, "pgm") == 0)
-                               gndo->ndo_packettype = PT_PGM;
-                       else if (strcasecmp(optarg, "pgm_zmtp1") == 0)
-                               gndo->ndo_packettype = PT_PGM_ZMTP1;
-                       else if (strcasecmp(optarg, "lmp") == 0)
-                               gndo->ndo_packettype = PT_LMP;
+                       if (ascii_strcasecmp(optarg, "vat") == 0)
+                               ndo->ndo_packettype = PT_VAT;
+                       else if (ascii_strcasecmp(optarg, "wb") == 0)
+                               ndo->ndo_packettype = PT_WB;
+                       else if (ascii_strcasecmp(optarg, "rpc") == 0)
+                               ndo->ndo_packettype = PT_RPC;
+                       else if (ascii_strcasecmp(optarg, "rtp") == 0)
+                               ndo->ndo_packettype = PT_RTP;
+                       else if (ascii_strcasecmp(optarg, "rtcp") == 0)
+                               ndo->ndo_packettype = PT_RTCP;
+                       else if (ascii_strcasecmp(optarg, "snmp") == 0)
+                               ndo->ndo_packettype = PT_SNMP;
+                       else if (ascii_strcasecmp(optarg, "cnfp") == 0)
+                               ndo->ndo_packettype = PT_CNFP;
+                       else if (ascii_strcasecmp(optarg, "tftp") == 0)
+                               ndo->ndo_packettype = PT_TFTP;
+                       else if (ascii_strcasecmp(optarg, "aodv") == 0)
+                               ndo->ndo_packettype = PT_AODV;
+                       else if (ascii_strcasecmp(optarg, "carp") == 0)
+                               ndo->ndo_packettype = PT_CARP;
+                       else if (ascii_strcasecmp(optarg, "radius") == 0)
+                               ndo->ndo_packettype = PT_RADIUS;
+                       else if (ascii_strcasecmp(optarg, "zmtp1") == 0)
+                               ndo->ndo_packettype = PT_ZMTP1;
+                       else if (ascii_strcasecmp(optarg, "vxlan") == 0)
+                               ndo->ndo_packettype = PT_VXLAN;
+                       else if (ascii_strcasecmp(optarg, "pgm") == 0)
+                               ndo->ndo_packettype = PT_PGM;
+                       else if (ascii_strcasecmp(optarg, "pgm_zmtp1") == 0)
+                               ndo->ndo_packettype = PT_PGM_ZMTP1;
+                       else if (ascii_strcasecmp(optarg, "lmp") == 0)
+                               ndo->ndo_packettype = PT_LMP;
+            else if (strcasecmp(optarg, "resp") == 0)
+                ndo->ndo_packettype = PT_RESP;
                        else
                                error("unknown packet type `%s'", optarg);
                        break;
 
                case 'u':
-                       ++gndo->ndo_uflag;
+                       ++ndo->ndo_uflag;
                        break;
 
 #ifdef HAVE_PCAP_DUMP_FLUSH
@@ -1080,7 +1132,7 @@ main(int argc, char **argv)
 #endif
 
                case 'v':
-                       ++gndo->ndo_vflag;
+                       ++ndo->ndo_vflag;
                        break;
 
                case 'V':
@@ -1093,53 +1145,47 @@ main(int argc, char **argv)
 
                case 'W':
                        Wflag = atoi(optarg);
-                       if (Wflag < 0)
+                       if (Wflag <= 0)
                                error("invalid number of output files %s", optarg);
                        WflagChars = getWflagChars(Wflag);
                        break;
 
                case 'x':
-                       ++gndo->ndo_xflag;
-                       ++gndo->ndo_suppress_default_print;
+                       ++ndo->ndo_xflag;
+                       ++ndo->ndo_suppress_default_print;
                        break;
 
                case 'X':
-                       ++gndo->ndo_Xflag;
-                       ++gndo->ndo_suppress_default_print;
+                       ++ndo->ndo_Xflag;
+                       ++ndo->ndo_suppress_default_print;
                        break;
 
                case 'y':
-                       gndo->ndo_dltname = optarg;
-                       gndo->ndo_dlt =
-                         pcap_datalink_name_to_val(gndo->ndo_dltname);
-                       if (gndo->ndo_dlt < 0)
-                               error("invalid data link type %s", gndo->ndo_dltname);
+                       yflag_dlt_name = optarg;
+                       yflag_dlt =
+                               pcap_datalink_name_to_val(yflag_dlt_name);
+                       if (yflag_dlt < 0)
+                               error("invalid data link type %s", yflag_dlt_name);
                        break;
 
-#if defined(HAVE_PCAP_DEBUG) || defined(HAVE_YYDEBUG)
+#ifdef HAVE_PCAP_SET_PARSER_DEBUG
                case 'Y':
                        {
                        /* Undocumented flag */
-#ifdef HAVE_PCAP_DEBUG
-                       extern int pcap_debug;
-                       pcap_debug = 1;
-#else
-                       extern int yydebug;
-                       yydebug = 1;
-#endif
+                       pcap_set_parser_debug(1);
                        }
                        break;
 #endif
                case 'z':
-                       zflag = strdup(optarg);
+                       zflag = optarg;
                        break;
 
                case 'Z':
-                       username = strdup(optarg);
+                       username = optarg;
                        break;
 
                case '#':
-                       gndo->ndo_packet_number = 1;
+                       ndo->ndo_packet_number = 1;
                        break;
 
                case OPTION_VERSION:
@@ -1149,15 +1195,15 @@ main(int argc, char **argv)
 
 #ifdef HAVE_PCAP_SET_TSTAMP_PRECISION
                case OPTION_TSTAMP_PRECISION:
-                       gndo->ndo_tstamp_precision = tstamp_precision_from_string(optarg);
-                       if (gndo->ndo_tstamp_precision < 0)
+                       ndo->ndo_tstamp_precision = tstamp_precision_from_string(optarg);
+                       if (ndo->ndo_tstamp_precision < 0)
                                error("unsupported time stamp precision");
                        break;
 #endif
 
 #ifdef HAVE_PCAP_SET_IMMEDIATE_MODE
                case OPTION_IMMEDIATE_MODE:
-                       gndo->ndo_immediate = 1;
+                       immediate_mode = 1;
                        break;
 #endif
 
@@ -1172,7 +1218,7 @@ main(int argc, char **argv)
                show_devices_and_exit();
 #endif
 
-       switch (gndo->ndo_tflag) {
+       switch (ndo->ndo_tflag) {
 
        case 0: /* Default */
        case 4: /* Default + Date*/
@@ -1190,7 +1236,7 @@ main(int argc, char **argv)
                break;
        }
 
-       if (gndo->ndo_fflag != 0 && (VFileName != NULL || RFileName != NULL))
+       if (ndo->ndo_fflag != 0 && (VFileName != NULL || RFileName != NULL))
                error("-f can not be used with -V or -r");
 
        if (VFileName != NULL && RFileName != NULL)
@@ -1204,7 +1250,7 @@ main(int argc, char **argv)
         * probably expecting to see packets pop up immediately.
         */
        if (WFileName == NULL && isatty(1))
-               gndo->ndo_immediate = 1;
+               immediate_mode = 1;
 #endif
 
 #ifdef WITH_CHROOT
@@ -1235,7 +1281,7 @@ main(int argc, char **argv)
                 * In either case, we're reading a savefile, not doing
                 * a live capture.
                 */
-#ifndef WIN32
+#ifndef _WIN32
                /*
                 * We don't need network access, so relinquish any set-UID
                 * or set-GID privileges we have (if any).
@@ -1247,7 +1293,7 @@ main(int argc, char **argv)
                 */
                if (setgid(getgid()) != 0 || setuid(getuid()) != 0 )
                        fprintf(stderr, "Warning: setgid/setuid failed !\n");
-#endif /* WIN32 */
+#endif /* _WIN32 */
                if (VFileName != NULL) {
                        if (VFileName[0] == '-' && VFileName[1] == '\0')
                                VFile = stdin;
@@ -1255,7 +1301,7 @@ main(int argc, char **argv)
                                VFile = fopen(VFileName, "r");
 
                        if (VFile == NULL)
-                               error("Unable to open file: %s\n", strerror(errno));
+                               error("Unable to open file: %s\n", pcap_strerror(errno));
 
                        ret = get_next_file(VFile, VFileLine);
                        if (!ret)
@@ -1265,7 +1311,7 @@ main(int argc, char **argv)
 
 #ifdef HAVE_PCAP_SET_TSTAMP_PRECISION
                pd = pcap_open_offline_with_tstamp_precision(RFileName,
-                   gndo->ndo_tstamp_precision, ebuf);
+                   ndo->ndo_tstamp_precision, ebuf);
 #else
                pd = pcap_open_offline(RFileName, ebuf);
 #endif
@@ -1295,11 +1341,19 @@ main(int argc, char **argv)
                 * We're doing a live capture.
                 */
                if (device == NULL) {
+#ifdef HAVE_PCAP_FINDALLDEVS
+                       if (pcap_findalldevs(&devlist, ebuf) >= 0 &&
+                           devlist != NULL) {
+                               device = strdup(devlist->name);
+                               pcap_freealldevs(devlist);
+                       }
+#else /* HAVE_PCAP_FINDALLDEVS */
                        device = pcap_lookupdev(ebuf);
+#endif
                        if (device == NULL)
                                error("%s", ebuf);
                }
-#ifdef WIN32
+#ifdef _WIN32
                /*
                 * Print a message to the standard error on Windows.
                 * XXX - why do it here, with a different message?
@@ -1314,26 +1368,26 @@ main(int argc, char **argv)
                }
 
                fflush(stderr);
-#endif /* WIN32 */
+#endif /* _WIN32 */
 #ifdef HAVE_PCAP_CREATE
                pd = pcap_create(device, ebuf);
                if (pd == NULL)
                        error("%s", ebuf);
 #ifdef HAVE_PCAP_SET_TSTAMP_TYPE
                if (Jflag)
-                       show_tstamp_types_and_exit(device, pd);
+                       show_tstamp_types_and_exit(device);
 #endif
 #ifdef HAVE_PCAP_SET_TSTAMP_PRECISION
-               status = pcap_set_tstamp_precision(pd, gndo->ndo_tstamp_precision);
+               status = pcap_set_tstamp_precision(pd, ndo->ndo_tstamp_precision);
                if (status != 0)
                        error("%s: Can't set %ssecond time stamp precision: %s",
                                device,
-                               tstamp_precision_to_string(gndo->ndo_tstamp_precision),
+                               tstamp_precision_to_string(ndo->ndo_tstamp_precision),
                                pcap_statustostr(status));
 #endif
 
 #ifdef HAVE_PCAP_SET_IMMEDIATE_MODE
-               if (gndo->ndo_immediate) {
+               if (immediate_mode) {
                        status = pcap_set_immediate_mode(pd, 1);
                        if (status != 0)
                                error("%s: Can't set immediate mode: %s",
@@ -1348,7 +1402,7 @@ main(int argc, char **argv)
                        supports_monitor_mode = 1;
                else
                        supports_monitor_mode = 0;
-               status = pcap_set_snaplen(pd, gndo->ndo_snaplen);
+               status = pcap_set_snaplen(pd, ndo->ndo_snaplen);
                if (status != 0)
                        error("%s: Can't set snapshot length: %s",
                            device, pcap_statustostr(status));
@@ -1422,7 +1476,8 @@ main(int argc, char **argv)
 #endif /* HAVE_PCAP_SETDIRECTION */
 #else
                *ebuf = '\0';
-               pd = pcap_open_live(device, snaplen, !pflag, 1000, ebuf);
+               pd = pcap_open_live(device, ndo->ndo_snaplen, !pflag, 1000,
+                   ebuf);
                if (pd == NULL)
                        error("%s", ebuf);
                else if (*ebuf)
@@ -1431,21 +1486,21 @@ main(int argc, char **argv)
                /*
                 * Let user own process after socket has been opened.
                 */
-#ifndef WIN32
+#ifndef _WIN32
                if (setgid(getgid()) != 0 || setuid(getuid()) != 0)
                        fprintf(stderr, "Warning: setgid/setuid failed !\n");
-#endif /* WIN32 */
-#if !defined(HAVE_PCAP_CREATE) && defined(WIN32)
+#endif /* _WIN32 */
+#if !defined(HAVE_PCAP_CREATE) && defined(_WIN32)
                if(Bflag != 0)
                        if(pcap_setbuff(pd, Bflag)==-1){
                                error("%s", pcap_geterr(pd));
                        }
-#endif /* !defined(HAVE_PCAP_CREATE) && defined(WIN32) */
+#endif /* !defined(HAVE_PCAP_CREATE) && defined(_WIN32) */
                if (Lflag)
-                       show_dlts_and_exit(device, pd);
-               if (gndo->ndo_dlt >= 0) {
+                       show_dlts_and_exit(device);
+               if (yflag_dlt >= 0) {
 #ifdef HAVE_PCAP_SET_DATALINK
-                       if (pcap_set_datalink(pd, gndo->ndo_dlt) < 0)
+                       if (pcap_set_datalink(pd, yflag_dlt) < 0)
                                error("%s", pcap_geterr(pd));
 #else
                        /*
@@ -1453,21 +1508,21 @@ main(int argc, char **argv)
                         * data link type, so we only let them
                         * set it to what it already is.
                         */
-                       if (gndo->ndo_dlt != pcap_datalink(pd)) {
+                       if (yflag_dlt != pcap_datalink(pd)) {
                                error("%s is not one of the DLTs supported by this device\n",
-                                     gndo->ndo_dltname);
+                                     yflag_dlt_name);
                        }
 #endif
                        (void)fprintf(stderr, "%s: data link type %s\n",
-                                     program_name, gndo->ndo_dltname);
+                                     program_name, yflag_dlt_name);
                        (void)fflush(stderr);
                }
                i = pcap_snapshot(pd);
-               if (gndo->ndo_snaplen < i) {
-                       warning("snaplen raised from %d to %d", gndo->ndo_snaplen, i);
-                       gndo->ndo_snaplen = i;
+               if (ndo->ndo_snaplen < i) {
+                       warning("snaplen raised from %d to %d", ndo->ndo_snaplen, i);
+                       ndo->ndo_snaplen = i;
                }
-                if(gndo->ndo_fflag != 0) {
+                if(ndo->ndo_fflag != 0) {
                         if (pcap_lookupnet(device, &localnet, &netmask, ebuf) < 0) {
                                 warning("foreign (-f) flag used but: %s", ebuf);
                         }
@@ -1479,31 +1534,35 @@ main(int argc, char **argv)
        else
                cmdbuf = copy_argv(&argv[optind]);
 
+#ifdef HAVE_PCAP_SET_OPTIMIZER_DEBUG
+       pcap_set_optimizer_debug(dflag);
+#endif
        if (pcap_compile(pd, &fcode, cmdbuf, Oflag, netmask) < 0)
                error("%s", pcap_geterr(pd));
        if (dflag) {
                bpf_dump(&fcode, dflag);
                pcap_close(pd);
                free(cmdbuf);
+               pcap_freecode(&fcode);
                exit(0);
        }
-       init_print(gndo, localnet, netmask, timezone_offset);
+       init_print(ndo, localnet, netmask, timezone_offset);
 
-#ifndef WIN32
+#ifndef _WIN32
        (void)setsignal(SIGPIPE, cleanup);
        (void)setsignal(SIGTERM, cleanup);
        (void)setsignal(SIGINT, cleanup);
-#endif /* WIN32 */
+#endif /* _WIN32 */
 #if defined(HAVE_FORK) || defined(HAVE_VFORK)
        (void)setsignal(SIGCHLD, child_cleanup);
 #endif
        /* Cooperate with nohup(1) */
-#ifndef WIN32
+#ifndef _WIN32
        if ((oldhandler = setsignal(SIGHUP, cleanup)) != SIG_DFL)
                (void)setsignal(SIGHUP, oldhandler);
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
-#ifndef WIN32
+#ifndef _WIN32
        /*
         * If a user name was specified with "-Z", attempt to switch to
         * that user's UID.  This would probably be used with sudo,
@@ -1548,13 +1607,13 @@ main(int argc, char **argv)
                        droproot(username, chroot_dir);
 
        }
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
        if (pcap_setfilter(pd, &fcode) < 0)
                error("%s", pcap_geterr(pd));
 #ifdef HAVE_CAPSICUM
        if (RFileName == NULL && VFileName == NULL) {
-               static const unsigned long cmds[] = { BIOCGSTATS };
+               static const unsigned long cmds[] = { BIOCGSTATS, BIOCROTZBUF };
 
                cap_rights_init(&rights, CAP_IOCTL, CAP_READ);
                if (cap_rights_limit(pcap_fileno(pd), &rights) < 0 &&
@@ -1603,6 +1662,10 @@ main(int argc, char **argv)
                if (Cflag != 0 || Gflag != 0) {
 #ifdef HAVE_CAPSICUM
                        dumpinfo.WFileName = strdup(basename(WFileName));
+                       if (dumpinfo.WFileName == NULL) {
+                               error("Unable to allocate memory for file %s",
+                                   WFileName);
+                       }
                        dumpinfo.dirfd = open(dirname(WFileName),
                            O_DIRECTORY | O_RDONLY);
                        if (dumpinfo.dirfd < 0) {
@@ -1635,10 +1698,10 @@ main(int argc, char **argv)
                        pcap_dump_flush(p);
 #endif
        } else {
-               type = pcap_datalink(pd);
-               printinfo = get_print_info(gndo, type);
+               dlt = pcap_datalink(pd);
+               ndo->ndo_if_printer = get_if_printer(ndo, dlt);
                callback = print_packet;
-               pcap_userdata = (u_char *)&printinfo;
+               pcap_userdata = (u_char *)ndo;
        }
 
 #ifdef SIGNAL_REQ_INFO
@@ -1650,10 +1713,10 @@ main(int argc, char **argv)
                (void)setsignal(SIGNAL_REQ_INFO, requestinfo);
 #endif
 
-       if (gndo->ndo_vflag > 0 && WFileName) {
+       if (ndo->ndo_vflag > 0 && WFileName) {
                /*
                 * When capturing to a file, "-v" means tcpdump should,
-                * every 10 secodns, "v"erbosely report the number of
+                * every 10 seconds, "v"erbosely report the number of
                 * packets captured.
                 */
 #ifdef USE_WIN32_MM_TIMER
@@ -1666,14 +1729,14 @@ main(int argc, char **argv)
 #endif
        }
 
-#ifndef WIN32
+#ifndef _WIN32
        if (RFileName == NULL) {
                /*
                 * Live capture (if -V was specified, we set RFileName
                 * to a file from the -V file).  Print a message to
                 * the standard error on UN*X.
                 */
-               if (!gndo->ndo_vflag && !WFileName) {
+               if (!ndo->ndo_vflag && !WFileName) {
                        (void)fprintf(stderr,
                            "%s: verbose output suppressed, use -v or -vv for full protocol decode\n",
                            program_name);
@@ -1683,22 +1746,20 @@ main(int argc, char **argv)
                dlt_name = pcap_datalink_val_to_name(dlt);
                if (dlt_name == NULL) {
                        (void)fprintf(stderr, "listening on %s, link-type %u, capture size %u bytes\n",
-                           device, dlt, gndo->ndo_snaplen);
+                           device, dlt, ndo->ndo_snaplen);
                } else {
                        (void)fprintf(stderr, "listening on %s, link-type %s (%s), capture size %u bytes\n",
                            device, dlt_name,
-                           pcap_datalink_val_to_description(dlt), gndo->ndo_snaplen);
+                           pcap_datalink_val_to_description(dlt), ndo->ndo_snaplen);
                }
                (void)fflush(stderr);
        }
-#endif /* WIN32 */
+#endif /* _WIN32 */
 
 #ifdef HAVE_CAPSICUM
-       cansandbox = (gndo->ndo_nflag && VFileName == NULL && zflag == NULL);
+       cansandbox = (ndo->ndo_nflag && VFileName == NULL && zflag == NULL);
        if (cansandbox && cap_enter() < 0 && errno != ENOSYS)
                error("unable to enter the capability mode");
-       if (cap_sandboxed())
-               fprintf(stderr, "capability mode sandbox enabled\n");
 #endif /* HAVE_CAPSICUM */
 
        do {
@@ -1744,6 +1805,8 @@ main(int argc, char **argv)
                if (VFileName != NULL) {
                        ret = get_next_file(VFile, VFileLine);
                        if (ret) {
+                               int new_dlt;
+
                                RFileName = VFileLine;
                                pd = pcap_open_offline(RFileName, ebuf);
                                if (pd == NULL)
@@ -1756,29 +1819,66 @@ main(int argc, char **argv)
                                }
 #endif
                                new_dlt = pcap_datalink(pd);
-                               if (WFileName && new_dlt != dlt)
-                                       error("%s: new dlt does not match original", RFileName);
-                               printinfo = get_print_info(gndo, new_dlt);
-                               dlt_name = pcap_datalink_val_to_name(new_dlt);
+                               if (new_dlt != dlt) {
+                                       /*
+                                        * The new file has a different
+                                        * link-layer header type from the
+                                        * previous one.
+                                        */
+                                       if (WFileName != NULL) {
+                                               /*
+                                                * We're writing raw packets
+                                                * that match the filter to
+                                                * a pcap file.  pcap files
+                                                * don't support multiple
+                                                * different link-layer
+                                                * header types, so we fail
+                                                * here.
+                                                */
+                                               error("%s: new dlt does not match original", RFileName);
+                                       }
+
+                                       /*
+                                        * We're printing the decoded packets;
+                                        * switch to the new DLT.
+                                        *
+                                        * To do that, we need to change
+                                        * the printer, change the DLT name,
+                                        * and recompile the filter with
+                                        * the new DLT.
+                                        */
+                                       dlt = new_dlt;
+                                       ndo->ndo_if_printer = get_if_printer(ndo, dlt);
+                                       if (pcap_compile(pd, &fcode, cmdbuf, Oflag, netmask) < 0)
+                                               error("%s", pcap_geterr(pd));
+                               }
+
+                               /*
+                                * Set the filter on the new file.
+                                */
+                               if (pcap_setfilter(pd, &fcode) < 0)
+                                       error("%s", pcap_geterr(pd));
+
+                               /*
+                                * Report the new file.
+                                */
+                               dlt_name = pcap_datalink_val_to_name(dlt);
                                if (dlt_name == NULL) {
                                        fprintf(stderr, "reading from file %s, link-type %u\n",
-                                       RFileName, new_dlt);
+                                           RFileName, dlt);
                                } else {
                                        fprintf(stderr,
                                        "reading from file %s, link-type %s (%s)\n",
-                                       RFileName, dlt_name,
-                                       pcap_datalink_val_to_description(new_dlt));
+                                           RFileName, dlt_name,
+                                           pcap_datalink_val_to_description(dlt));
                                }
-                               if (pcap_compile(pd, &fcode, cmdbuf, Oflag, netmask) < 0)
-                                       error("%s", pcap_geterr(pd));
-                               if (pcap_setfilter(pd, &fcode) < 0)
-                                       error("%s", pcap_geterr(pd));
                        }
                }
        }
        while (ret != NULL);
 
        free(cmdbuf);
+       pcap_freecode(&fcode);
        exit(status == -1 ? 1 : 0);
 }
 
@@ -1838,14 +1938,14 @@ child_cleanup(int signo _U_)
 static void
 info(register int verbose)
 {
-       struct pcap_stat stat;
+       struct pcap_stat stats;
 
        /*
         * Older versions of libpcap didn't set ps_ifdrop on some
         * platforms; initialize it to 0 to handle that.
         */
-       stat.ps_ifdrop = 0;
-       if (pcap_stats(pd, &stat) < 0) {
+       stats.ps_ifdrop = 0;
+       if (pcap_stats(pd, &stats) < 0) {
                (void)fprintf(stderr, "pcap_stats: %s\n", pcap_geterr(pd));
                infoprint = 0;
                return;
@@ -1860,38 +1960,52 @@ info(register int verbose)
                fputs(", ", stderr);
        else
                putc('\n', stderr);
-       (void)fprintf(stderr, "%u packet%s received by filter", stat.ps_recv,
-           PLURAL_SUFFIX(stat.ps_recv));
+       (void)fprintf(stderr, "%u packet%s received by filter", stats.ps_recv,
+           PLURAL_SUFFIX(stats.ps_recv));
        if (!verbose)
                fputs(", ", stderr);
        else
                putc('\n', stderr);
-       (void)fprintf(stderr, "%u packet%s dropped by kernel", stat.ps_drop,
-           PLURAL_SUFFIX(stat.ps_drop));
-       if (stat.ps_ifdrop != 0) {
+       (void)fprintf(stderr, "%u packet%s dropped by kernel", stats.ps_drop,
+           PLURAL_SUFFIX(stats.ps_drop));
+       if (stats.ps_ifdrop != 0) {
                if (!verbose)
                        fputs(", ", stderr);
                else
                        putc('\n', stderr);
                (void)fprintf(stderr, "%u packet%s dropped by interface\n",
-                   stat.ps_ifdrop, PLURAL_SUFFIX(stat.ps_ifdrop));
+                   stats.ps_ifdrop, PLURAL_SUFFIX(stats.ps_ifdrop));
        } else
                putc('\n', stderr);
        infoprint = 0;
 }
 
 #if defined(HAVE_FORK) || defined(HAVE_VFORK)
+#ifdef HAVE_FORK
+#define fork_subprocess() fork()
+#else
+#define fork_subprocess() vfork()
+#endif
 static void
 compress_savefile(const char *filename)
 {
-# ifdef HAVE_FORK
-       if (fork())
-# else
-       if (vfork())
-# endif
+       pid_t child;
+
+       child = fork_subprocess();
+       if (child == -1) {
+               fprintf(stderr,
+                       "compress_savefile: fork failed: %s\n",
+                       pcap_strerror(errno));
                return;
+       }
+       if (child != 0) {
+               /* Parent process. */
+               return;
+       }
+
        /*
-        * Set to lowest priority so that this doesn't disturb the capture
+        * Child process.
+        * Set to lowest priority so that this doesn't disturb the capture.
         */
 #ifdef NZERO
        setpriority(PRIO_PROCESS, 0, NZERO - 1);
@@ -1900,15 +2014,15 @@ compress_savefile(const char *filename)
 #endif
        if (execlp(zflag, zflag, filename, (char *)NULL) == -1)
                fprintf(stderr,
-                       "compress_savefile:execlp(%s, %s): %s\n",
+                       "compress_savefile: execlp(%s, %s) failed: %s\n",
                        zflag,
                        filename,
-                       strerror(errno));
-# ifdef HAVE_FORK
+                       pcap_strerror(errno));
+#ifdef HAVE_FORK
        exit(1);
-# else
+#else
        _exit(1);
-# endif
+#endif
 }
 #else  /* HAVE_FORK && HAVE_VFORK */
 static void
@@ -2141,22 +2255,18 @@ dump_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 static void
 print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 {
-       struct print_info *print_info;
-
        ++packets_captured;
 
        ++infodelay;
 
-       print_info = (struct print_info *)user;
-
-       pretty_print_packet(print_info, h, sp, packets_captured);
+       pretty_print_packet((netdissect_options *)user, h, sp, packets_captured);
 
        --infodelay;
        if (infoprint)
                info(0);
 }
 
-#ifdef WIN32
+#ifdef _WIN32
        /*
         * XXX - there should really be libpcap calls to get the version
         * number as a string (the string would be generated from #defines
@@ -2200,17 +2310,13 @@ RETSIGTYPE requestinfo(int signo _U_)
 void CALLBACK verbose_stats_dump (UINT timer_id _U_, UINT msg _U_, DWORD_PTR arg _U_,
                                  DWORD_PTR dw1 _U_, DWORD_PTR dw2 _U_)
 {
-       struct pcap_stat stat;
-
-       if (infodelay == 0 && pcap_stats(pd, &stat) >= 0)
+       if (infodelay == 0)
                fprintf(stderr, "Got %u\r", packets_captured);
 }
 #elif defined(HAVE_ALARM)
 static void verbose_stats_dump(int sig _U_)
 {
-       struct pcap_stat stat;
-
-       if (infodelay == 0 && pcap_stats(pd, &stat) >= 0)
+       if (infodelay == 0)
                fprintf(stderr, "Got %u\r", packets_captured);
        alarm(1);
 }
@@ -2222,28 +2328,28 @@ print_version(void)
 {
        extern char version[];
 #ifndef HAVE_PCAP_LIB_VERSION
-#if defined(WIN32) || defined(HAVE_PCAP_VERSION)
+#if defined(_WIN32) || defined(HAVE_PCAP_VERSION)
        extern char pcap_version[];
-#else /* defined(WIN32) || defined(HAVE_PCAP_VERSION) */
+#else /* defined(_WIN32) || defined(HAVE_PCAP_VERSION) */
        static char pcap_version[] = "unknown";
-#endif /* defined(WIN32) || defined(HAVE_PCAP_VERSION) */
+#endif /* defined(_WIN32) || defined(HAVE_PCAP_VERSION) */
 #endif /* HAVE_PCAP_LIB_VERSION */
 
 #ifdef HAVE_PCAP_LIB_VERSION
-#ifdef WIN32
+#ifdef _WIN32
        (void)fprintf(stderr, "%s version %s, based on tcpdump version %s\n", program_name, WDversion, version);
-#else /* WIN32 */
+#else /* _WIN32 */
        (void)fprintf(stderr, "%s version %s\n", program_name, version);
-#endif /* WIN32 */
+#endif /* _WIN32 */
        (void)fprintf(stderr, "%s\n",pcap_lib_version());
 #else /* HAVE_PCAP_LIB_VERSION */
-#ifdef WIN32
+#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 /* WIN32 */
+#else /* _WIN32 */
        (void)fprintf(stderr, "%s version %s\n", program_name, version);
        (void)fprintf(stderr, "libpcap version %s\n", pcap_version);
-#endif /* WIN32 */
+#endif /* _WIN32 */
 #endif /* HAVE_PCAP_LIB_VERSION */
 
 #if defined(HAVE_LIBCRYPTO) && defined(SSLEAY_VERSION)
@@ -2261,7 +2367,7 @@ print_usage(void)
 {
        print_version();
        (void)fprintf(stderr,
-"Usage: %s [-aAbd" D_FLAG "efhH" I_FLAG J_FLAG "KlLnNOpqRStu" U_FLAG "vxX#]" B_FLAG_USAGE " [ -c count ]\n", program_name);
+"Usage: %s [-aAbd" D_FLAG "efhH" I_FLAG J_FLAG "KlLnNOpqStu" U_FLAG "vxX#]" B_FLAG_USAGE " [ -c count ]\n", program_name);
        (void)fprintf(stderr,
 "\t\t[ -C file_size ] [ -E algo:secret ] [ -F file ] [ -G seconds ]\n");
        (void)fprintf(stderr,
@@ -2282,7 +2388,7 @@ print_usage(void)
 #endif
        (void)fprintf(stderr, "[ -T type ] [ --version ] [ -V file ]\n");
        (void)fprintf(stderr,
-"\t\t[ -w file ] [ -W filecount ] [ -y datalinktype ] [ -z command ]\n");
+"\t\t[ -w file ] [ -W filecount ] [ -y datalinktype ] [ -z postrotate-command ]\n");
        (void)fprintf(stderr,
 "\t\t[ -Z user ] [ expression ]\n");
 }