LSP ping: Put the RFC number right. [skip ci]

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index cd277042e3483e91d65b495b7633b2bdf09cb214..a0d627db6395c674de029dac8a2435b04963b688 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.


@@ -220,6 +230,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;


@@ -237,8 +248,8 @@ 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);
+static void print_version(FILE *);
+static void print_usage(FILE *);

 #ifdef HAVE_PCAP_SET_TSTAMP_TYPE
 static NORETURN void show_tstamp_types_and_exit(pcap_t *, const char *device);
 #endif
 #ifdef HAVE_PCAP_SET_TSTAMP_TYPE
 static NORETURN void show_tstamp_types_and_exit(pcap_t *, const char *device);
 #endif


@@ -690,6 +701,7 @@ show_remote_devices_and_exit(void)
 #define OPTION_TSTAMP_MICRO            133
 #define OPTION_TSTAMP_NANO             134
 #define OPTION_FP_TYPE                 135
 #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)


@@ -733,6 +745,7 @@ 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 },
        { "fp-type", no_argument, NULL, OPTION_FP_TYPE },
        { "number", no_argument, NULL, '#' },
        { "print", no_argument, NULL, OPTION_PRINT },


@@ -938,7 +951,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


@@ -1495,7 +1508,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];


@@ -1625,7 +1638,7 @@ main(int argc, char **argv)
                        break;
 
                case 'h':
                        break;
 
                case 'h':

-                       print_usage();
+                       print_usage(stdout);

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


@@ -1793,6 +1806,8 @@ main(int argc, char **argv)
                                ndo->ndo_packettype = PT_PTP;
                        else if (ascii_strcasecmp(optarg, "someip") == 0)
                                ndo->ndo_packettype = PT_SOMEIP;
                                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;


@@ -1865,7 +1880,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;
 


@@ -1908,8 +1923,12 @@ main(int argc, char **argv)
                        float_type_check(0x4e93312d);
                        return 0;
 
                        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 */
                }


@@ -1923,6 +1942,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 */


@@ -2171,7 +2198,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);


@@ -2382,7 +2410,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;


@@ -2393,7 +2421,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;
        }


@@ -2410,11 +2438,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
                /*


@@ -2452,7 +2483,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);


@@ -2566,7 +2597,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));
                                }


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

+       if (count_mode && RFileName != NULL)
+               fprintf(stderr, "%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);


@@ -3027,7 +3062,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)


@@ -3084,7 +3120,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


@@ -3095,59 +3131,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");
 }