CHANGES: Move change(s) backported to 4.99

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 3786b1da8d44bf79cd012e6e0a42d11c2c94d234..e59756716de5438422efb332861807e4ed647f06 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -34,6 +34,9 @@
  */
 
 #include <config.h>
  */
 
 #include <config.h>

+#ifndef TCPDUMP_CONFIG_H_
+#error "The included config.h header is not from the tcpdump build."
+#endif

 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 


@@ -137,11 +140,9 @@ 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"

-#include "pcap-missing.h"

 #include "ascii_strcasecmp.h"
 
 #include "print.h"
 #include "ascii_strcasecmp.h"
 
 #include "print.h"


@@ -201,13 +202,15 @@ static int Qflag = -1;                    /* restrict captured packet by send/receive direction *
 static int Uflag;                      /* "unbuffered" output of dump files */
 static int Wflag;                      /* recycle output files after this number of files */
 static int WflagChars;
 static int Uflag;                      /* "unbuffered" output of dump files */
 static int Wflag;                      /* recycle output files after this number of files */
 static int WflagChars;

+#if defined(HAVE_FORK) || defined(HAVE_VFORK)

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

+#endif

 static int timeout = 1000;             /* default timeout = 1000 ms = 1 s */
 #ifdef HAVE_PCAP_SET_IMMEDIATE_MODE
 static int immediate_mode;
 #endif
 static int count_mode;
 static int timeout = 1000;             /* default timeout = 1000 ms = 1 s */
 #ifdef HAVE_PCAP_SET_IMMEDIATE_MODE
 static int immediate_mode;
 #endif
 static int count_mode;

-static u_int packets_skipped;
+static u_int packets_to_skip;

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


@@ -223,7 +226,9 @@ static int64_t parse_int64(const char *argname, const char *string,
     char **endp, int64_t minval, int64_t maxval, int base);
 static void (*setsignal (int sig, void (*func)(int)))(int);
 static void cleanup(int);
     char **endp, int64_t minval, int64_t maxval, int base);
 static void (*setsignal (int sig, void (*func)(int)))(int);
 static void cleanup(int);

+#if defined(HAVE_FORK) || defined(HAVE_VFORK)

 static void child_cleanup(int);
 static void child_cleanup(int);

+#endif

 static void print_version(FILE *);
 static void print_usage(FILE *);
 
 static void print_version(FILE *);
 static void print_usage(FILE *);
 


@@ -611,7 +616,27 @@ show_remote_devices_and_exit(void)
 #define m_FLAG_USAGE "[ -m module ] ..."
 #endif
 
 #define m_FLAG_USAGE "[ -m module ] ..."
 #endif
 

-#define SHORTOPTS "aAbB:c:C:dDeE:fF:G:hHi:I" j_FLAG J_FLAG "KlLm:M:nNOpqQ:r:s:StT:uUvV:w:W:xXy:Yz:Z:#"
+#if defined(HAVE_FORK) || defined(HAVE_VFORK)
+#define z_FLAG         "z:"
+#define z_FLAG_USAGE    "[ -z postrotate-command ] "
+#else
+#define z_FLAG
+#define z_FLAG_USAGE
+#endif
+
+#ifdef HAVE_LIBCRYPTO
+#define E_FLAG         "E:"
+#define E_FLAG_USAGE    "[ -E algo:secret ] "
+#define M_FLAG         "M:"
+#define M_FLAG_USAGE   "[ -M secret ] "
+#else
+#define E_FLAG
+#define E_FLAG_USAGE
+#define M_FLAG
+#define M_FLAG_USAGE
+#endif
+
+#define SHORTOPTS "aAbB:c:C:dDe" E_FLAG "fF:G:hHi:I" j_FLAG J_FLAG "KlLm:" M_FLAG "nNOpqQ:r:s:StT:uUvV:w:W:xXy:Y" z_FLAG "Z:#"

 
 /*
  * Long options.
 
 /*
  * Long options.


@@ -726,7 +751,7 @@ droproot(const char *username, const char *chroot_dir)
                {
                        int ret = capng_change_id(pw->pw_uid, pw->pw_gid, CAPNG_NO_FLAG);
                        if (ret < 0)
                {
                        int ret = capng_change_id(pw->pw_uid, pw->pw_gid, CAPNG_NO_FLAG);
                        if (ret < 0)

-                               error("capng_change_id(): return %d\n", ret);
+                               error("capng_change_id(): return %d", ret);

                        else
                                fprintf(stderr, "dropped privs to %s\n", username);
                }
                        else
                                fprintf(stderr, "dropped privs to %s\n", username);
                }


@@ -1346,6 +1371,11 @@ open_interface(const char *device, netdissect_options *ndo, char *ebuf)
                } else if (status == PCAP_ERROR_PERM_DENIED && *cp != '\0')
                        error("%s: %s\n(%s)", device,
                            pcap_statustostr(status), cp);
                } else if (status == PCAP_ERROR_PERM_DENIED && *cp != '\0')
                        error("%s: %s\n(%s)", device,
                            pcap_statustostr(status), cp);

+#ifdef PCAP_ERROR_CAPTURE_NOTSUP
+               else if (status == PCAP_ERROR_CAPTURE_NOTSUP && *cp != '\0')
+                       error("%s: %s\n(%s)", device,
+                           pcap_statustostr(status), cp);
+#endif

 #ifdef __FreeBSD__
                else if (status == PCAP_ERROR_RFMON_NOTSUP &&
                    strncmp(device, "wlan", 4) == 0) {
 #ifdef __FreeBSD__
                else if (status == PCAP_ERROR_RFMON_NOTSUP &&
                    strncmp(device, "wlan", 4) == 0) {


@@ -1363,7 +1393,7 @@ open_interface(const char *device, netdissect_options *ndo, char *ebuf)
                         * specific case would be an error message that looks a bit odd.
                         */
                        newdev[strlen(newdev)-1]++;
                         * specific case would be an error message that looks a bit odd.
                         */
                        newdev[strlen(newdev)-1]++;

-                       error("%s is not a monitor mode VAP\n"
+                       error("%s is not a monitor mode VAP"

                            "To create a new monitor mode VAP use:\n"
                            "  ifconfig %s create wlandev %s wlanmode monitor\n"
                            "and use %s as the tcpdump interface",
                            "To create a new monitor mode VAP use:\n"
                            "  ifconfig %s create wlandev %s wlanmode monitor\n"
                            "and use %s as the tcpdump interface",


@@ -1757,12 +1787,11 @@ main(int argc, char **argv)
                        ++ndo->ndo_eflag;
                        break;
 
                        ++ndo->ndo_eflag;
                        break;
 

+#ifdef HAVE_LIBCRYPTO

                case 'E':
                case 'E':

-#ifndef HAVE_LIBCRYPTO
-                       warning("crypto code not compiled in");
-#endif

                        ndo->ndo_espsecret = optarg;
                        break;
                        ndo->ndo_espsecret = optarg;
                        break;

+#endif

 
                case 'f':
                        ++ndo->ndo_fflag;
 
                case 'f':
                        ++ndo->ndo_fflag;


@@ -1848,13 +1877,12 @@ main(int argc, char **argv)
                        }
                        break;
 
                        }
                        break;
 

+#ifdef HAVE_LIBCRYPTO

                case 'M':
                        /* TCP-MD5 shared secret */
                case 'M':
                        /* TCP-MD5 shared secret */

-#ifndef HAVE_LIBCRYPTO
-                       warning("crypto code not compiled in");
-#endif

                        ndo->ndo_sigsecret = optarg;
                        break;
                        ndo->ndo_sigsecret = optarg;
                        break;

+#endif

 
                case 'n':
                        ++ndo->ndo_nflag;
 
                case 'n':
                        ++ndo->ndo_nflag;


@@ -2004,9 +2032,12 @@ main(int argc, char **argv)
                        }
                        break;
 #endif
                        }
                        break;
 #endif

+
+#if defined(HAVE_FORK) || defined(HAVE_VFORK)

                case 'z':
                        zflag = optarg;
                        break;
                case 'z':
                        zflag = optarg;
                        break;

+#endif

 
                case 'Z':
                        username = optarg;
 
                case 'Z':
                        username = optarg;


@@ -2055,8 +2086,8 @@ main(int argc, char **argv)
                        break;
 
                case OPTION_SKIP:
                        break;
 
                case OPTION_SKIP:

-                       packets_skipped = parse_u_int("packet skip count",
-                           optarg, NULL, 1, UINT_MAX, 0);
+                       packets_to_skip = parse_u_int("packet skip count",
+                           optarg, NULL, 0, INT_MAX, 0);

                        break;
 
 #ifdef HAVE_PCAP_SET_TSTAMP_PRECISION
                        break;
 
 #ifdef HAVE_PCAP_SET_TSTAMP_PRECISION


@@ -2091,11 +2122,25 @@ main(int argc, char **argv)
                }
 
        if (ndo->ndo_Aflag && ndo->ndo_xflag)
                }
 
        if (ndo->ndo_Aflag && ndo->ndo_xflag)

-               warning("-A and -x[x] are mutually exclusive. -A ignored.");
+               error("-A and -x[x] are mutually exclusive.");

        if (ndo->ndo_Aflag && ndo->ndo_Xflag)
        if (ndo->ndo_Aflag && ndo->ndo_Xflag)

-               warning("-A and -X[X] are mutually exclusive. -A ignored.");
+               error("-A and -X[X] are mutually exclusive.");

        if (ndo->ndo_xflag && ndo->ndo_Xflag)
        if (ndo->ndo_xflag && ndo->ndo_Xflag)

-               warning("-x[x] and -X[X] are mutually exclusive. -x[x] ignored.");
+               error("-x[x] and -X[X] are mutually exclusive.");
+       if (Cflag != 0 && WFileName == NULL)
+               error("-C cannot be used without -w.");
+       if (Gflag != 0 && WFileName == NULL)
+               error("-G cannot be used without -w.");
+#if defined(HAVE_FORK) || defined(HAVE_VFORK)
+       if (zflag != NULL && (WFileName == NULL || (Cflag == 0 && Gflag == 0)))
+               error("-z cannot be used without -w and (-C or -G).");
+#endif
+
+       if (cnt != -1)
+               if ((int)packets_to_skip > (INT_MAX - cnt))
+                       // cnt + (int)packets_to_skip used in pcap_loop() call
+                       error("Overflow (-c count) %d + (--skip count) %d", cnt,
+                             (int)packets_to_skip);

 
        if (Dflag)
                show_devices_and_exit();
 
        if (Dflag)
                show_devices_and_exit();


@@ -2120,7 +2165,7 @@ main(int argc, char **argv)
        }
 
        if (ndo->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");
+               error("-f cannot be used with -V or -r.");

 
        if (VFileName != NULL && RFileName != NULL)
                error("-V and -r are mutually exclusive.");
 
        if (VFileName != NULL && RFileName != NULL)
                error("-V and -r are mutually exclusive.");


@@ -2188,11 +2233,11 @@ main(int argc, char **argv)
                                VFile = fopen(VFileName, "r");
 
                        if (VFile == NULL)
                                VFile = fopen(VFileName, "r");
 
                        if (VFile == NULL)

-                               error("Unable to open file: %s\n", pcap_strerror(errno));
+                               error("Unable to open file: %s", pcap_strerror(errno));

 
                        ret = get_next_file(VFile, VFileLine);
                        if (!ret)
 
                        ret = get_next_file(VFile, VFileLine);
                        if (!ret)

-                               error("Nothing in %s\n", VFileName);
+                               error("Nothing in %s", VFileName);

                        RFileName = VFileLine;
                }
 
                        RFileName = VFileLine;
                }
 


@@ -2364,7 +2409,11 @@ DIAG_ON_WARN_UNUSED_RESULT
 #ifdef HAVE_PCAP_SET_OPTIMIZER_DEBUG
        pcap_set_optimizer_debug(dflag);
 #endif
 #ifdef HAVE_PCAP_SET_OPTIMIZER_DEBUG
        pcap_set_optimizer_debug(dflag);
 #endif

-       if (pcap_compile(pd, &fcode, cmdbuf, Oflag, netmask) < 0)
+       /*
+        * netmask is in network byte order, pcap_compile() takes it
+        * in host byte order.
+        */
+       if (pcap_compile(pd, &fcode, cmdbuf, Oflag, ntohl(netmask)) < 0)

                error("%s", pcap_geterr(pd));
        if (dflag) {
                bpf_dump(&fcode, dflag);
                error("%s", pcap_geterr(pd));
        if (dflag) {
                bpf_dump(&fcode, dflag);


@@ -2379,6 +2428,7 @@ DIAG_ON_WARN_UNUSED_RESULT
                capdns = capdns_setup();
 #endif /* HAVE_CASPER */
 
                capdns = capdns_setup();
 #endif /* HAVE_CASPER */
 

+       // Both localnet and netmask are in network byte order.

        init_print(ndo, localnet, netmask);
 
 #ifndef _WIN32
        init_print(ndo, localnet, netmask);
 
 #ifndef _WIN32


@@ -2693,7 +2743,7 @@ DIAG_ON_ASSIGN_ENUM
 
        do {
                status = pcap_loop(pd,
 
        do {
                status = pcap_loop(pd,

-                                  cnt + (cnt == -1 ? 0 : packets_skipped),
+                                  (cnt == -1 ? -1 : cnt + (int)packets_to_skip),

                                   callback, pcap_userdata);
                if (WFileName == NULL) {
                        /*
                                   callback, pcap_userdata);
                if (WFileName == NULL) {
                        /*


@@ -2782,7 +2832,11 @@ DIAG_ON_ASSIGN_ENUM
                                        ndo->ndo_if_printer = get_if_printer(dlt);
                                        /* Free the old filter */
                                        pcap_freecode(&fcode);
                                        ndo->ndo_if_printer = get_if_printer(dlt);
                                        /* Free the old filter */
                                        pcap_freecode(&fcode);

-                                       if (pcap_compile(pd, &fcode, cmdbuf, Oflag, netmask) < 0)
+                                       /*
+                                        * netmask is in network byte order, pcap_compile() takes it
+                                        * in host byte order.
+                                        */
+                                       if (pcap_compile(pd, &fcode, cmdbuf, Oflag, ntohl(netmask)) < 0)

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


@@ -3082,8 +3136,8 @@ compress_savefile(const char *filename)
        child = fork_subprocess();
        if (child == -1) {
                fprintf(stderr,
        child = fork_subprocess();
        if (child == -1) {
                fprintf(stderr,

-                       "compress_savefile: fork failed: %s\n",
-                       pcap_strerror(errno));
+                       "%s: fork failed: %s\n",
+                       __func__, pcap_strerror(errno));

                return;
        }
        if (child != 0) {
                return;
        }
        if (child != 0) {


@@ -3102,24 +3156,15 @@ compress_savefile(const char *filename)
 #endif
        if (execlp(zflag, zflag, filename, (char *)NULL) == -1)
                fprintf(stderr,
 #endif
        if (execlp(zflag, zflag, filename, (char *)NULL) == -1)
                fprintf(stderr,

-                       "compress_savefile: execlp(%s, %s) failed: %s\n",
-                       zflag,
-                       filename,
-                       pcap_strerror(errno));
+                       "%s: execlp(%s, %s) failed: %s\n",
+                       __func__, zflag, filename, pcap_strerror(errno));

 #ifdef HAVE_FORK
        exit(S_ERR_HOST_PROGRAM);
 #else
        _exit(S_ERR_HOST_PROGRAM);
 #endif
 }
 #ifdef HAVE_FORK
        exit(S_ERR_HOST_PROGRAM);
 #else
        _exit(S_ERR_HOST_PROGRAM);
 #endif
 }

-#else  /* HAVE_FORK && HAVE_VFORK */
-static void
-compress_savefile(const char *filename)
-{
-       fprintf(stderr,
-               "compress_savefile failed. Functionality not implemented under your system\n");
-}
-#endif /* HAVE_FORK && HAVE_VFORK */
+#endif /* HAVE_FORK || HAVE_VFORK */

 
 static void
 close_old_dump_file(struct dump_info *dump_info)
 
 static void
 close_old_dump_file(struct dump_info *dump_info)


@@ -3129,11 +3174,13 @@ close_old_dump_file(struct dump_info *dump_info)
         */
        pcap_dump_close(dump_info->pdd);
 
         */
        pcap_dump_close(dump_info->pdd);
 

+#if defined(HAVE_FORK) || defined(HAVE_VFORK)

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

+#endif

 }
 
 static void
 }
 
 static void


@@ -3184,7 +3231,7 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
 
        dump_info = (struct dump_info *)user;
 
 
        dump_info = (struct dump_info *)user;
 

-       if (packets_captured <= packets_skipped)
+       if (packets_captured <= packets_to_skip)

                return;
 
        /*
                return;
 
        /*


@@ -3316,7 +3363,7 @@ dump_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 
        dump_info = (struct dump_info *)user;
 
 
        dump_info = (struct dump_info *)user;
 

-       if (packets_captured <= packets_skipped)
+       if (packets_captured <= packets_to_skip)

                return;
 
        pcap_dump((u_char *)dump_info->pdd, h, sp);
                return;
 
        pcap_dump((u_char *)dump_info->pdd, h, sp);


@@ -3338,7 +3385,7 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 
        ++infodelay;
 
 
        ++infodelay;
 

-       if (!count_mode && packets_captured > packets_skipped)
+       if (!count_mode && packets_captured > packets_to_skip)

                pretty_print_packet((netdissect_options *)user, h, sp, packets_captured);
 
        --infodelay;
                pretty_print_packet((netdissect_options *)user, h, sp, packets_captured);
 
        --infodelay;


@@ -3432,7 +3479,7 @@ print_usage(FILE *f)
        (void)fprintf(f,
 "Usage: %s [-AbdDefhHI" J_FLAG "KlLnNOpqStuUvxX#] [ -B size ] [ -c count ] [--count]\n", program_name);
        (void)fprintf(f,
        (void)fprintf(f,
 "Usage: %s [-AbdDefhHI" J_FLAG "KlLnNOpqStuUvxX#] [ -B size ] [ -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_FLAG_USAGE "[ -F file ] [ -G seconds ]\n");

        (void)fprintf(f,
 "\t\t[ -i interface ]" IMMEDIATE_MODE_USAGE j_FLAG_USAGE "\n");
        (void)fprintf(f,
        (void)fprintf(f,
 "\t\t[ -i interface ]" IMMEDIATE_MODE_USAGE j_FLAG_USAGE "\n");
        (void)fprintf(f,


@@ -3442,7 +3489,7 @@ print_usage(FILE *f)
 "\t\t" m_FLAG_USAGE "\n");
 #endif
        (void)fprintf(f,
 "\t\t" m_FLAG_USAGE "\n");
 #endif
        (void)fprintf(f,

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

        (void)fprintf(f,
 "\t\t[ --print-sampling nth ] [ -Q in|out|inout ] [ -r file ]\n");
        (void)fprintf(f,
        (void)fprintf(f,
 "\t\t[ --print-sampling nth ] [ -Q in|out|inout ] [ -r file ]\n");
        (void)fprintf(f,


@@ -3454,5 +3501,5 @@ print_usage(FILE *f)
 "\t\t[ --time-stamp-precision precision ] [ --micro ] [ --nano ]\n");
 #endif
        (void)fprintf(f,
 "\t\t[ --time-stamp-precision precision ] [ --micro ] [ --nano ]\n");
 #endif
        (void)fprintf(f,

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

 }
 }