Lose a few forward declarations in tcpdump.c.

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 64aad1603d2a2cc771eb8ec3d77f5a5549375de9..0bde64682edd31e3d966626ad92f8c01922bf2ed 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -124,6 +124,16 @@ The Regents of the University of California.  All rights reserved.\n";
 #include <grp.h>
 #endif /* _WIN32 */
 
 #include <grp.h>
 #endif /* _WIN32 */
 

+/*
+ * Pathname separator.
+ * Use this in pathnames, but do *not* use it in URLs.
+ */
+#ifdef _WIN32
+#define PATH_SEPARATOR '\\'
+#else
+#define PATH_SEPARATOR '/'
+#endif
+

 /* capabilities convenience library */
 /* If a code depends on HAVE_LIBCAP_NG, it depends also on HAVE_CAP_NG_H.
  * If HAVE_CAP_NG_H is not defined, undefine HAVE_LIBCAP_NG.
 /* capabilities convenience library */
 /* If a code depends on HAVE_LIBCAP_NG, it depends also on HAVE_CAP_NG_H.
  * If HAVE_CAP_NG_H is not defined, undefine HAVE_LIBCAP_NG.


@@ -141,6 +151,7 @@ The Regents of the University of California.  All rights reserved.\n";
 #include <sys/sysctl.h>
 #endif /* __FreeBSD__ */
 
 #include <sys/sysctl.h>
 #endif /* __FreeBSD__ */
 

+#include "netdissect-stdinc.h"

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


@@ -150,6 +161,8 @@ The Regents of the University of California.  All rights reserved.\n";
 
 #include "print.h"
 
 
 #include "print.h"
 

+#include "fptype.h"
+

 #ifndef PATH_MAX
 #define PATH_MAX 1024
 #endif
 #ifndef PATH_MAX
 #define PATH_MAX 1024
 #endif


@@ -218,6 +231,7 @@ static int timeout = 1000;          /* default timeout = 1000 ms = 1 s */
 #ifdef HAVE_PCAP_SET_IMMEDIATE_MODE
 static int immediate_mode;
 #endif
 #ifdef HAVE_PCAP_SET_IMMEDIATE_MODE
 static int immediate_mode;
 #endif

+static int count_mode;

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


@@ -229,29 +243,15 @@ cap_channel_t *capdns;
 #endif
 
 /* Forwards */
 #endif
 
 /* Forwards */

-static NORETURN void error(FORMAT_STRING(const char *), ...) PRINTFLIKE(1, 2);
-static void warning(FORMAT_STRING(const char *), ...) PRINTFLIKE(1, 2);
-static NORETURN void exit_tcpdump(int);

 static void (*setsignal (int sig, void (*func)(int)))(int);
 static void cleanup(int);
 static void child_cleanup(int);
 static void (*setsignal (int sig, void (*func)(int)))(int);
 static void cleanup(int);
 static void child_cleanup(int);

-static void print_version(void);
-static void print_usage(void);
-#ifdef HAVE_PCAP_SET_TSTAMP_TYPE
-static NORETURN void show_tstamp_types_and_exit(pcap_t *, const char *device);
-#endif
-static NORETURN void show_dlts_and_exit(pcap_t *, const char *device);
-#ifdef HAVE_PCAP_FINDALLDEVS
-static NORETURN void show_devices_and_exit(void);
-#endif
-#ifdef HAVE_PCAP_FINDALLDEVS_EX
-static NORETURN void show_remote_devices_and_exit(void);
-#endif
+static void print_version(FILE *);
+static void print_usage(FILE *);

 
 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 *);
 static void dump_packet(u_char *, const struct pcap_pkthdr *, const u_char *);
 
 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 *);
 static void dump_packet(u_char *, const struct pcap_pkthdr *, const u_char *);

-static void droproot(const char *, const char *);

 
 #ifdef SIGNAL_REQ_INFO
 static void requestinfo(int);
 
 #ifdef SIGNAL_REQ_INFO
 static void requestinfo(int);


@@ -358,9 +358,16 @@ extern
 void pcap_set_optimizer_debug(int);
 #endif
 
 void pcap_set_optimizer_debug(int);
 #endif
 

+static void NORETURN
+exit_tcpdump(const int status)
+{
+       nd_cleanup();
+       exit(status);
+}
+

 /* VARARGS */
 /* VARARGS */

-static void
-error(const char *fmt, ...)
+static void NORETURN PRINTFLIKE(1, 2)
+error(FORMAT_STRING(const char *fmt), ...)

 {
        va_list ap;
 
 {
        va_list ap;
 


@@ -378,8 +385,8 @@ error(const char *fmt, ...)
 }
 
 /* VARARGS */
 }
 
 /* VARARGS */

-static void
-warning(const char *fmt, ...)
+static void PRINTFLIKE(1, 2)
+warning(FORMAT_STRING(const char *fmt), ...)

 {
        va_list ap;
 
 {
        va_list ap;
 


@@ -394,15 +401,8 @@ warning(const char *fmt, ...)
        }
 }
 
        }
 }
 

-static void
-exit_tcpdump(int status)
-{
-       nd_cleanup();
-       exit(status);
-}
-

 #ifdef HAVE_PCAP_SET_TSTAMP_TYPE
 #ifdef HAVE_PCAP_SET_TSTAMP_TYPE

-static void
+static void NORETURN

 show_tstamp_types_and_exit(pcap_t *pc, const char *device)
 {
        int n_tstamp_types;
 show_tstamp_types_and_exit(pcap_t *pc, const char *device)
 {
        int n_tstamp_types;


@@ -435,7 +435,7 @@ show_tstamp_types_and_exit(pcap_t *pc, const char *device)
 }
 #endif
 
 }
 #endif
 

-static void
+static void NORETURN

 show_dlts_and_exit(pcap_t *pc, const char *device)
 {
        int n_dlts, i;
 show_dlts_and_exit(pcap_t *pc, const char *device)
 {
        int n_dlts, i;


@@ -488,7 +488,7 @@ show_dlts_and_exit(pcap_t *pc, const char *device)
 }
 
 #ifdef HAVE_PCAP_FINDALLDEVS
 }
 
 #ifdef HAVE_PCAP_FINDALLDEVS

-static void
+static void NORETURN

 show_devices_and_exit(void)
 {
        pcap_if_t *dev, *devlist;
 show_devices_and_exit(void)
 {
        pcap_if_t *dev, *devlist;


@@ -553,7 +553,7 @@ show_devices_and_exit(void)
 #endif /* HAVE_PCAP_FINDALLDEVS */
 
 #ifdef HAVE_PCAP_FINDALLDEVS_EX
 #endif /* HAVE_PCAP_FINDALLDEVS */
 
 #ifdef HAVE_PCAP_FINDALLDEVS_EX

-static void
+static void NORETURN

 show_remote_devices_and_exit(void)
 {
        pcap_if_t *dev, *devlist;
 show_remote_devices_and_exit(void)
 {
        pcap_if_t *dev, *devlist;


@@ -687,6 +687,8 @@ show_remote_devices_and_exit(void)
 #define OPTION_LIST_REMOTE_INTERFACES  132
 #define OPTION_TSTAMP_MICRO            133
 #define OPTION_TSTAMP_NANO             134
 #define OPTION_LIST_REMOTE_INTERFACES  132
 #define OPTION_TSTAMP_MICRO            133
 #define OPTION_TSTAMP_NANO             134

+#define OPTION_FP_TYPE                 135
+#define OPTION_COUNT                   136

 
 static const struct option longopts[] = {
 #if defined(HAVE_PCAP_CREATE) || defined(_WIN32)
 
 static const struct option longopts[] = {
 #if defined(HAVE_PCAP_CREATE) || defined(_WIN32)


@@ -730,6 +732,8 @@ static const struct option longopts[] = {
        { "debug-filter-parser", no_argument, NULL, 'Y' },
 #endif
        { "relinquish-privileges", required_argument, NULL, 'Z' },
        { "debug-filter-parser", no_argument, NULL, 'Y' },
 #endif
        { "relinquish-privileges", required_argument, NULL, 'Z' },

+       { "count", no_argument, NULL, OPTION_COUNT },
+       { "fp-type", no_argument, NULL, OPTION_FP_TYPE },

        { "number", no_argument, NULL, '#' },
        { "print", no_argument, NULL, OPTION_PRINT },
        { "version", no_argument, NULL, OPTION_VERSION },
        { "number", no_argument, NULL, '#' },
        { "print", no_argument, NULL, OPTION_PRINT },
        { "version", no_argument, NULL, OPTION_VERSION },


@@ -824,7 +828,7 @@ MakeFilename(char *buffer, char *orig_name, int cnt, int max_chars)
 {
         char *filename = malloc(PATH_MAX + 1);
         if (filename == NULL)
 {
         char *filename = malloc(PATH_MAX + 1);
         if (filename == NULL)

-            error("Makefilename: malloc");
+            error("%s: malloc", __func__);

 
         /* Process with strftime if Gflag is set. */
         if (Gflag != 0) {
 
         /* Process with strftime if Gflag is set. */
         if (Gflag != 0) {


@@ -832,7 +836,7 @@ MakeFilename(char *buffer, char *orig_name, int cnt, int max_chars)
 
           /* Convert Gflag_time to a usable format */
           if ((local_tm = localtime(&Gflag_time)) == NULL) {
 
           /* Convert Gflag_time to a usable format */
           if ((local_tm = localtime(&Gflag_time)) == NULL) {

-                  error("MakeTimedFilename: localtime");
+                  error("%s: localtime", __func__);

           }
 
           /* There's no good way to detect an error in strftime since a return
           }
 
           /* There's no good way to detect an error in strftime since a return


@@ -934,7 +938,7 @@ tstamp_precision_to_string(int precision)
  * necessary to make the standard I/O library work with an fdopen()ed
  * FILE * from that descriptor.
  *
  * necessary to make the standard I/O library work with an fdopen()ed
  * FILE * from that descriptor.
  *

- * A long time ago, in a galaxy far far away, AT&T decided that, instead
+ * A long time ago in a galaxy far, far away, AT&T decided that, instead

  * of providing separate APIs for getting and setting the FD_ flags on a
  * descriptor, getting and setting the O_ flags on a descriptor, and
  * locking files, they'd throw them all into a kitchen-sink fcntl() call
  * of providing separate APIs for getting and setting the FD_ flags on a
  * descriptor, getting and setting the O_ flags on a descriptor, and
  * locking files, they'd throw them all into a kitchen-sink fcntl() call


@@ -1018,7 +1022,7 @@ copy_argv(char **argv)
 
        buf = (char *)malloc(len);
        if (buf == NULL)
 
        buf = (char *)malloc(len);
        if (buf == NULL)

-               error("copy_argv: malloc");
+               error("%s: malloc", __func__);

 
        p = argv;
        dst = buf;
 
        p = argv;
        dst = buf;


@@ -1048,15 +1052,22 @@ read_infile(char *fname)
        int i, fd;
        ssize_t cc;
        char *cp;
        int i, fd;
        ssize_t cc;
        char *cp;

-       struct stat buf;
+       our_statb buf;

 
        fd = open(fname, O_RDONLY|O_BINARY);
        if (fd < 0)
                error("can't open %s: %s", fname, pcap_strerror(errno));
 
 
        fd = open(fname, O_RDONLY|O_BINARY);
        if (fd < 0)
                error("can't open %s: %s", fname, pcap_strerror(errno));
 

-       if (fstat(fd, &buf) < 0)
+       if (our_fstat(fd, &buf) < 0)

                error("can't stat %s: %s", fname, pcap_strerror(errno));
 
                error("can't stat %s: %s", fname, pcap_strerror(errno));
 

+       /*
+        * Reject files whose size doesn't fit into an int; a filter
+        * *that* large will probably be too big.
+        */
+       if (buf.st_size > INT_MAX)
+               error("%s is too large", fname);
+

        cp = malloc((u_int)buf.st_size + 1);
        if (cp == NULL)
                error("malloc(%d) for %s: %s", (u_int)buf.st_size + 1,
        cp = malloc((u_int)buf.st_size + 1);
        if (cp == NULL)
                error("malloc(%d) for %s: %s", (u_int)buf.st_size + 1,


@@ -1065,7 +1076,8 @@ read_infile(char *fname)
        if (cc < 0)
                error("read %s: %s", fname, pcap_strerror(errno));
        if (cc != buf.st_size)
        if (cc < 0)
                error("read %s: %s", fname, pcap_strerror(errno));
        if (cc != buf.st_size)

-               error("short read %s (%zd != %d)", fname, cc, (int)buf.st_size);
+               error("short read %s (%d != %d)", fname, (int) cc,
+                   (int)buf.st_size);

 
        close(fd);
        /* replace "# comment" with spaces */
 
        close(fd);
        /* replace "# comment" with spaces */


@@ -1491,7 +1503,7 @@ main(int argc, char **argv)
        VFile = NULL;
        WFileName = NULL;
        dlt = -1;
        VFile = NULL;
        WFileName = NULL;
        dlt = -1;

-       if ((cp = strrchr(argv[0], '/')) != NULL)
+       if ((cp = strrchr(argv[0], PATH_SEPARATOR)) != NULL)

                ndo->program_name = program_name = cp + 1;
        else
                ndo->program_name = program_name = argv[0];
                ndo->program_name = program_name = cp + 1;
        else
                ndo->program_name = program_name = argv[0];


@@ -1615,13 +1627,13 @@ main(int argc, char **argv)
 
                        /* Grab the current time for rotation use. */
                        if ((Gflag_time = time(NULL)) == (time_t)-1) {
 
                        /* 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));
+                               error("%s: can't get current time: %s",
+                                   __func__, pcap_strerror(errno));

                        }
                        break;
 
                case 'h':
                        }
                        break;
 
                case 'h':

-                       print_usage();
+                       print_usage(stdout);

                        exit_tcpdump(S_SUCCESS);
                        break;
 
                        exit_tcpdump(S_SUCCESS);
                        break;
 


@@ -1787,6 +1799,10 @@ main(int argc, char **argv)
                                ndo->ndo_packettype = PT_RESP;
                        else if (ascii_strcasecmp(optarg, "ptp") == 0)
                                ndo->ndo_packettype = PT_PTP;
                                ndo->ndo_packettype = PT_RESP;
                        else if (ascii_strcasecmp(optarg, "ptp") == 0)
                                ndo->ndo_packettype = PT_PTP;

+                       else if (ascii_strcasecmp(optarg, "someip") == 0)
+                               ndo->ndo_packettype = PT_SOMEIP;
+                       else if (ascii_strcasecmp(optarg, "domain") == 0)
+                               ndo->ndo_packettype = PT_DOMAIN;

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


@@ -1859,7 +1875,7 @@ main(int argc, char **argv)
                        break;
 
                case OPTION_VERSION:
                        break;
 
                case OPTION_VERSION:

-                       print_version();
+                       print_version(stdout);

                        exit_tcpdump(S_SUCCESS);
                        break;
 
                        exit_tcpdump(S_SUCCESS);
                        break;
 


@@ -1891,8 +1907,23 @@ main(int argc, char **argv)
                        break;
 #endif
 
                        break;
 #endif
 

+               case OPTION_FP_TYPE:
+                       /*
+                        * Print out the type of floating-point arithmetic
+                        * we're doing; it's probably IEEE, unless somebody
+                        * tries to run this on a VAX, but the precision
+                        * may differ (e.g., it might be 32-bit, 64-bit,
+                        * or 80-bit).
+                        */
+                       float_type_check(0x4e93312d);
+                       return 0;
+
+               case OPTION_COUNT:
+                       count_mode = 1;
+                       break;
+

                default:
                default:

-                       print_usage();
+                       print_usage(stderr);

                        exit_tcpdump(S_ERR_HOST_PROGRAM);
                        /* NOTREACHED */
                }
                        exit_tcpdump(S_ERR_HOST_PROGRAM);
                        /* NOTREACHED */
                }


@@ -1906,6 +1937,14 @@ main(int argc, char **argv)
                show_remote_devices_and_exit();
 #endif
 
                show_remote_devices_and_exit();
 #endif
 

+#if defined(DLT_LINUX_SLL2) && defined(HAVE_PCAP_SET_DATALINK)
+/* Set default linktype DLT_LINUX_SLL2 when capturing on the "any" device */
+               if (device != NULL &&
+                   strncmp (device, "any", strlen("any")) == 0
+                   && yflag_dlt == -1)
+                       yflag_dlt = DLT_LINUX_SLL2;
+#endif
+

        switch (ndo->ndo_tflag) {
 
        case 0: /* Default */
        switch (ndo->ndo_tflag) {
 
        case 0: /* Default */


@@ -2154,7 +2193,8 @@ 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, yflag_dlt_name);
+                                     program_name,
+                                     pcap_datalink_val_to_name(yflag_dlt));

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


@@ -2365,7 +2405,7 @@ DIAG_ON_CLANG(assign-enum)
                }
                if (print) {
                        dlt = pcap_datalink(pd);
                }
                if (print) {
                        dlt = pcap_datalink(pd);

-                       ndo->ndo_if_printer = get_if_printer(ndo, dlt);
+                       ndo->ndo_if_printer = get_if_printer(dlt);

                        dumpinfo.ndo = ndo;
                } else
                        dumpinfo.ndo = NULL;
                        dumpinfo.ndo = ndo;
                } else
                        dumpinfo.ndo = NULL;


@@ -2376,7 +2416,7 @@ DIAG_ON_CLANG(assign-enum)
 #endif
        } else {
                dlt = pcap_datalink(pd);
 #endif
        } else {
                dlt = pcap_datalink(pd);

-               ndo->ndo_if_printer = get_if_printer(ndo, dlt);
+               ndo->ndo_if_printer = get_if_printer(dlt);

                callback = print_packet;
                pcap_userdata = (u_char *)ndo;
        }
                callback = print_packet;
                pcap_userdata = (u_char *)ndo;
        }


@@ -2393,11 +2433,14 @@ DIAG_ON_CLANG(assign-enum)
        (void)setsignal(SIGNAL_FLUSH_PCAP, flushpcap);
 #endif
 
        (void)setsignal(SIGNAL_FLUSH_PCAP, flushpcap);
 #endif
 

-       if (ndo->ndo_vflag > 0 && WFileName && !print) {
+       if (ndo->ndo_vflag > 0 && WFileName && RFileName == NULL && !print) {

                /*
                 * When capturing to a file, if "--print" wasn't specified,
                 *"-v" means tcpdump should, once per second,
                 * "v"erbosely report the number of packets captured.
                /*
                 * When capturing to a file, if "--print" wasn't specified,
                 *"-v" means tcpdump should, once per second,
                 * "v"erbosely report the number of packets captured.

+                * Except when reading from a file, because -r, -w and -v
+                * together used to make a corner case, in which pcap_loop()
+                * errored due to EINTR (see GH #155 for details).

                 */
 #ifdef _WIN32
                /*
                 */
 #ifdef _WIN32
                /*


@@ -2435,7 +2478,7 @@ DIAG_ON_CLANG(assign-enum)
                 */
                if (!ndo->ndo_vflag && !WFileName) {
                        (void)fprintf(stderr,
                 */
                if (!ndo->ndo_vflag && !WFileName) {
                        (void)fprintf(stderr,

-                           "%s: verbose output suppressed, use -v or -vv for full protocol decode\n",
+                           "%s: verbose output suppressed, use -v[v]... for full protocol decode\n",

                            program_name);
                } else
                        (void)fprintf(stderr, "%s: ", program_name);
                            program_name);
                } else
                        (void)fprintf(stderr, "%s: ", program_name);


@@ -2549,7 +2592,7 @@ DIAG_ON_CLANG(assign-enum)
                                         * the new DLT.
                                         */
                                        dlt = new_dlt;
                                         * the new DLT.
                                         */
                                        dlt = new_dlt;

-                                       ndo->ndo_if_printer = get_if_printer(ndo, dlt);
+                                       ndo->ndo_if_printer = get_if_printer(dlt);

                                        if (pcap_compile(pd, &fcode, cmdbuf, Oflag, netmask) < 0)
                                                error("%s", pcap_geterr(pd));
                                }
                                        if (pcap_compile(pd, &fcode, cmdbuf, Oflag, netmask) < 0)
                                                error("%s", pcap_geterr(pd));
                                }


@@ -2578,6 +2621,10 @@ DIAG_ON_CLANG(assign-enum)
        }
        while (ret != NULL);
 
        }
        while (ret != NULL);
 

+       if (count_mode && RFileName != NULL)
+               fprintf(stdout, "%u packet%s\n", packets_captured,
+                       PLURAL_SUFFIX(packets_captured));
+

        free(cmdbuf);
        pcap_freecode(&fcode);
        exit_tcpdump(status == -1 ? 1 : 0);
        free(cmdbuf);
        pcap_freecode(&fcode);
        exit_tcpdump(status == -1 ? 1 : 0);


@@ -2788,8 +2835,8 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
 
                /* Get the current time */
                if ((t = time(NULL)) == (time_t)-1) {
 
                /* 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));
+                       error("%s: can't get current_time: %s",
+                           __func__, pcap_strerror(errno));

                }
 
 
                }
 
 


@@ -2930,7 +2977,7 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
                                free(dump_info->CurrentFileName);
                        dump_info->CurrentFileName = (char *)malloc(PATH_MAX + 1);
                        if (dump_info->CurrentFileName == NULL)
                                free(dump_info->CurrentFileName);
                        dump_info->CurrentFileName = (char *)malloc(PATH_MAX + 1);
                        if (dump_info->CurrentFileName == NULL)

-                               error("dump_packet_and_trunc: malloc");
+                               error("%s: malloc", __func__);

                        MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, Cflag_count, WflagChars);
 #ifdef HAVE_LIBCAP_NG
                        capng_update(CAPNG_ADD, CAPNG_EFFECTIVE, CAP_DAC_OVERRIDE);
                        MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, Cflag_count, WflagChars);
 #ifdef HAVE_LIBCAP_NG
                        capng_update(CAPNG_ADD, CAPNG_EFFECTIVE, CAP_DAC_OVERRIDE);


@@ -3010,7 +3057,8 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 
        ++infodelay;
 
 
        ++infodelay;
 

-       pretty_print_packet((netdissect_options *)user, h, sp, packets_captured);
+       if (!count_mode)
+               pretty_print_packet((netdissect_options *)user, h, sp, packets_captured);

 
        --infodelay;
        if (infoprint)
 
        --infodelay;
        if (infoprint)


@@ -3067,7 +3115,7 @@ static void verbose_stats_dump(int sig _U_)
 
 USES_APPLE_DEPRECATED_API
 static void
 
 USES_APPLE_DEPRECATED_API
 static void

-print_version(void)
+print_version(FILE *f)

 {
 #ifndef HAVE_PCAP_LIB_VERSION
   #ifdef HAVE_PCAP_VERSION
 {
 #ifndef HAVE_PCAP_LIB_VERSION
   #ifdef HAVE_PCAP_VERSION


@@ -3078,59 +3126,61 @@ print_version(void)
 #endif /* HAVE_PCAP_LIB_VERSION */
        const char *smi_version_string;
 
 #endif /* HAVE_PCAP_LIB_VERSION */
        const char *smi_version_string;
 

-       (void)fprintf(stderr, "%s version " PACKAGE_VERSION "\n", program_name);
+       (void)fprintf(f, "%s version " PACKAGE_VERSION "\n", program_name);

 #ifdef HAVE_PCAP_LIB_VERSION
 #ifdef HAVE_PCAP_LIB_VERSION

-       (void)fprintf(stderr, "%s\n", pcap_lib_version());
+       (void)fprintf(f, "%s\n", pcap_lib_version());

 #else /* HAVE_PCAP_LIB_VERSION */
 #else /* HAVE_PCAP_LIB_VERSION */

-       (void)fprintf(stderr, "libpcap version %s\n", pcap_version);
+       (void)fprintf(f, "libpcap version %s\n", pcap_version);

 #endif /* HAVE_PCAP_LIB_VERSION */
 
 #if defined(HAVE_LIBCRYPTO) && defined(SSLEAY_VERSION)
 #endif /* HAVE_PCAP_LIB_VERSION */
 
 #if defined(HAVE_LIBCRYPTO) && defined(SSLEAY_VERSION)

-       (void)fprintf (stderr, "%s\n", SSLeay_version(SSLEAY_VERSION));
+       (void)fprintf (f, "%s\n", SSLeay_version(SSLEAY_VERSION));

 #endif
 
        smi_version_string = nd_smi_version_string();
        if (smi_version_string != NULL)
 #endif
 
        smi_version_string = nd_smi_version_string();
        if (smi_version_string != NULL)

-               (void)fprintf (stderr, "SMI-library: %s\n", smi_version_string);
+               (void)fprintf (f, "SMI-library: %s\n", smi_version_string);

 
 #if defined(__SANITIZE_ADDRESS__)
 
 #if defined(__SANITIZE_ADDRESS__)

-       (void)fprintf (stderr, "Compiled with AddressSanitizer/GCC.\n");
+       (void)fprintf (f, "Compiled with AddressSanitizer/GCC.\n");

 #elif defined(__has_feature)
 #  if __has_feature(address_sanitizer)
 #elif defined(__has_feature)
 #  if __has_feature(address_sanitizer)

-       (void)fprintf (stderr, "Compiled with AddressSanitizer/CLang.\n");
+       (void)fprintf (f, "Compiled with AddressSanitizer/Clang.\n");
+#  elif __has_feature(memory_sanitizer)
+       (void)fprintf (f, "Compiled with MemorySanitizer/Clang.\n");

 #  endif
 #endif /* __SANITIZE_ADDRESS__ or __has_feature */
 }
 USES_APPLE_RST
 
 static void
 #  endif
 #endif /* __SANITIZE_ADDRESS__ or __has_feature */
 }
 USES_APPLE_RST
 
 static void

-print_usage(void)
+print_usage(FILE *f)

 {
 {

-       print_version();
-       (void)fprintf(stderr,
-"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,
+       print_version(f);
+       (void)fprintf(f,
+"Usage: %s [-Abd" D_FLAG "efhH" I_FLAG J_FLAG "KlLnNOpqStu" U_FLAG "vxX#]" B_FLAG_USAGE " [ -c count ] [--count]\n", program_name);
+       (void)fprintf(f,

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

-       (void)fprintf(stderr,
+       (void)fprintf(f,

 "\t\t[ -i interface ]" IMMEDIATE_MODE_USAGE j_FLAG_USAGE "\n");
 #ifdef HAVE_PCAP_FINDALLDEVS_EX
 "\t\t[ -i interface ]" IMMEDIATE_MODE_USAGE j_FLAG_USAGE "\n");
 #ifdef HAVE_PCAP_FINDALLDEVS_EX

-       (void)fprintf(stderr,
+       (void)fprintf(f,

 "\t\t" LIST_REMOTE_INTERFACES_USAGE "\n");
 #endif
 #ifdef USE_LIBSMI
 "\t\t" LIST_REMOTE_INTERFACES_USAGE "\n");
 #endif
 #ifdef USE_LIBSMI

-       (void)fprintf(stderr,
+       (void)fprintf(f,

 "\t\t" m_FLAG_USAGE "\n");
 #endif
 "\t\t" m_FLAG_USAGE "\n");
 #endif

-       (void)fprintf(stderr,
+       (void)fprintf(f,

 "\t\t[ -M secret ] [ --number ] [ --print ]" Q_FLAG_USAGE "\n");
 "\t\t[ -M secret ] [ --number ] [ --print ]" Q_FLAG_USAGE "\n");

-       (void)fprintf(stderr,
+       (void)fprintf(f,

 "\t\t[ -r file ] [ -s snaplen ] [ -T type ] [ --version ]\n");
 "\t\t[ -r file ] [ -s snaplen ] [ -T type ] [ --version ]\n");

-       (void)fprintf(stderr,
+       (void)fprintf(f,

 "\t\t[ -V file ] [ -w file ] [ -W filecount ] [ -y datalinktype ]\n");
 #ifdef HAVE_PCAP_SET_TSTAMP_PRECISION
 "\t\t[ -V file ] [ -w file ] [ -W filecount ] [ -y datalinktype ]\n");
 #ifdef HAVE_PCAP_SET_TSTAMP_PRECISION

-       (void)fprintf(stderr,
+       (void)fprintf(f,

 "\t\t[ --time-stamp-precision precision ] [ --micro ] [ --nano ]\n");
 #endif
 "\t\t[ --time-stamp-precision precision ] [ --micro ] [ --nano ]\n");
 #endif

-       (void)fprintf(stderr,
+       (void)fprintf(f,

 "\t\t[ -z postrotate-command ] [ -Z user ] [ expression ]\n");
 }
 "\t\t[ -z postrotate-command ] [ -Z user ] [ expression ]\n");
 }