Upgrade to tcpdump-4.0.0.
[dragonfly.git] / contrib / tcpdump / tcpdump.c
index caf419e..4328b30 100644 (file)
@@ -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_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.253.2.13 2007/09/12 19:48:51 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.271.2.11 2008-09-25 21:50:04 guy Exp $ (LBL)";
 #endif
 
 /*
@@ -65,12 +65,16 @@ extern int SIZE_BUF;
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
 #ifndef WIN32
+#include <sys/wait.h>
+#include <sys/resource.h>
 #include <pwd.h>
 #include <grp.h>
 #include <errno.h>
 #endif /* WIN32 */
 
+
 #include "netdissect.h"
 #include "interface.h"
 #include "addrtoname.h"
@@ -79,19 +83,16 @@ extern int SIZE_BUF;
 #include "gmt2local.h"
 #include "pcap-missing.h"
 
+#ifndef NAME_MAX
+#define NAME_MAX 255
+#endif
+
 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 */
+char *zflag = NULL;            /* compress each savefile using a specified command (like gzip or bzip2) */
 
 static int infodelay;
 static int infoprint;
@@ -102,6 +103,7 @@ int32_t thiszone;           /* seconds offset from gmt to local time */
 
 /* 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));
 
@@ -220,6 +222,9 @@ static struct printer printers[] = {
 #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
@@ -267,6 +272,9 @@ static struct printer printers[] = {
 #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 },
 };
@@ -296,6 +304,7 @@ struct print_info {
 
 struct dump_info {
        char    *WFileName;
+       char    *CurrentFileName;
        pcap_t  *pd;
        pcap_dumper_t *p;
 };
@@ -325,10 +334,10 @@ show_dlts_and_exit(pcap_t *pd)
                         * 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 {
-                       (void) fprintf(stderr, "  DLT %d (not supported)\n",
+                       (void) fprintf(stderr, "  DLT %d (printing not supported)\n",
                            dlts[n_dlts]);
                }
        }
@@ -340,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.
  */
-#ifdef WIN32
+#if defined(HAVE_PCAP_CREATE) || defined(WIN32)
 #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
-#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
@@ -423,10 +438,32 @@ getWflagChars(int x)
 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)
-               strcpy(buffer, orig_name);
+               strncpy(buffer, filename, NAME_MAX + 1);
        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_,
@@ -448,7 +485,7 @@ main(int argc, char **argv)
 {
        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;
@@ -467,7 +504,6 @@ main(int argc, char **argv)
 #endif
        int status;
 #ifdef WIN32
-       u_int UserBufferSize = 1000000;
        if(wsockinit() != 0) return 1;
 #endif /* WIN32 */
 
@@ -499,7 +535,7 @@ main(int argc, char **argv)
 
        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':
@@ -510,13 +546,13 @@ main(int argc, char **argv)
                        ++Aflag;
                        break;
 
-#ifdef WIN32
+#if defined(HAVE_PCAP_CREATE) || defined(WIN32)
                case 'B':
-                       UserBufferSize = atoi(optarg)*1024;
-                       if (UserBufferSize < 0)
+                       Bflag = atoi(optarg)*1024;
+                       if (Bflag <= 0)
                                error("invalid packet buffer size %s", optarg);
                        break;
-#endif /* WIN32 */
+#endif /* defined(HAVE_PCAP_CREATE) || defined(WIN32) */
 
                case 'c':
                        cnt = atoi(optarg);
@@ -573,6 +609,21 @@ main(int argc, char **argv)
                        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");
@@ -608,6 +659,12 @@ main(int argc, char **argv)
                        device = optarg;
                        break;
 
+#ifdef HAVE_PCAP_CREATE
+               case 'I':
+                       ++Iflag;
+                       break;
+#endif /* HAVE_PCAP_CREATE */
+
                case 'l':
 #ifdef WIN32
                        /*
@@ -629,19 +686,15 @@ main(int argc, char **argv)
 #endif /* WIN32 */
                        break;
 
-               case 'n':
-                       ++nflag;
-                       break;
-
-               case 'N':
-                       ++Nflag;
+               case 'K':
+                       ++Kflag;
                        break;
 
                case 'm':
 #ifdef LIBSMI
-                       if (smiLoadModule(optarg) == 0) {
+                       if (smiLoadModule(optarg) == 0) {
                                error("could not load MIB module %s", optarg);
-                       }
+                       }
                        sflag = 1;
 #else
                        (void)fprintf(stderr, "%s: ignoring option `-m %s' ",
@@ -658,6 +711,14 @@ main(int argc, char **argv)
                        tcpmd5secret = optarg;
                        break;
 
+               case 'n':
+                       ++nflag;
+                       break;
+
+               case 'N':
+                       ++Nflag;
+                       break;
+
                case 'O':
                        Oflag = 0;
                        break;
@@ -779,6 +840,15 @@ main(int argc, char **argv)
                        }
                        break;
 #endif
+               case 'z':
+                       if (optarg) {
+                               zflag = strdup(optarg);
+                       } else {
+                               usage();
+                               /* NOTREACHED */
+                       }
+                       break;
+
                case 'Z':
                        if (optarg) {
                                username = strdup(optarg);
@@ -804,10 +874,11 @@ main(int argc, char **argv)
        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 */
-               error("only -t, -tt, -ttt, and -tttt are supported");
+               error("only -t, -tt, -ttt, -tttt and -ttttt are supported");
                break;
        }
 
@@ -882,12 +953,74 @@ main(int argc, char **argv)
 
                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);
+#endif /* HAVE_PCAP_CREATE */
                /*
                 * Let user own process after socket has been opened.
                 */
@@ -895,12 +1028,12 @@ main(int argc, char **argv)
                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));
                        }
-#endif /* WIN32 */
+#endif /* !defined(HAVE_PCAP_CREATE) && defined(WIN32) */
                if (Lflag)
                        show_dlts_and_exit(pd);
                if (gndo->ndo_dlt >= 0) {
@@ -919,7 +1052,7 @@ main(int argc, char **argv)
                        }
 #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);
@@ -946,12 +1079,14 @@ main(int argc, char **argv)
                exit(0);
        }
        init_addrtoname(localnet, netmask);
+        init_checksum();
 
 #ifndef WIN32  
        (void)setsignal(SIGPIPE, cleanup);
-#endif /* WIN32 */
        (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)
@@ -962,15 +1097,22 @@ main(int argc, char **argv)
                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");
+
+               /* 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);
 
-               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);
+               p = pcap_dump_open(pd, dumpinfo.CurrentFileName);
                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;
@@ -1005,7 +1147,12 @@ main(int argc, char **argv)
        }
 #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) {
@@ -1123,6 +1270,18 @@ cleanup(int signo _U_)
 #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)
 {
@@ -1130,6 +1289,7 @@ info(register int verbose)
 
        if (pcap_stats(pd, &stat) < 0) {
                (void)fprintf(stderr, "pcap_stats: %s\n", pcap_geterr(pd));
+               infoprint = 0;
                return;
        }
 
@@ -1150,11 +1310,40 @@ info(register int verbose)
        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;
-       char *name;
 
        ++packets_captured;
 
@@ -1162,30 +1351,104 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
 
        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.
         */
-       if (pcap_dump_ftell(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);
+
+               /*
+                * 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;
-               } 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");
-               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));
        }
@@ -1362,7 +1625,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_,
-                                  DWORD_PTR dw1 _U_, DWORD_PTR dw2 _U_)
+                                 DWORD_PTR dw1 _U_, DWORD_PTR dw2 _U_)
 {
        struct pcap_stat stat;
 
@@ -1409,13 +1672,15 @@ usage(void)
 #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,
+"\t\t[ -C file_size ] [ -E algo:secret ] [ -F file ] [ -G seconds ]\n");
        (void)fprintf(stderr,
-"\t\t[ -E algo:secret ] [ -F file ] [ -i interface ] [ -M secret ]\n");
+"\t\t[ -i interface ] [ -M secret ] [ -r file ]\n");
        (void)fprintf(stderr,
-"\t\t[ -r file ] [ -s snaplen ] [ -T type ] [ -w file ]\n");
+"\t\t[ -s snaplen ] [ -T type ] [ -w file ] [ -W filecount ]\n");
        (void)fprintf(stderr,
-"\t\t[ -W filecount ] [ -y datalinktype ] [ -Z user ]\n");
+"\t\t[ -y datalinktype ] [ -z command ] [ -Z user ]\n");
        (void)fprintf(stderr,
 "\t\t[ expression ]\n");
        exit(1);
@@ -1458,4 +1723,3 @@ ndo_warning(netdissect_options *ndo _U_, const char *fmt, ...)
                        (void)fputc('\n', stderr);
        }
 }
-