Fix dissection of RFC 4684 routing information.

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 8ea4925148bcae0853bcfdc5604dda004282de9a..65defd0d652c1b58e8f4ccf465ec29cb021851f9 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -132,7 +132,6 @@ The Regents of the University of California.  All rights reserved.\n";
 #include "interface.h"
 #include "addrtoname.h"
 #include "machdep.h"
 #include "interface.h"
 #include "addrtoname.h"
 #include "machdep.h"

-#include "gmt2local.h"

 #include "pcap-missing.h"
 #include "ascii_strcasecmp.h"
 
 #include "pcap-missing.h"
 #include "ascii_strcasecmp.h"
 


@@ -152,7 +151,9 @@ The Regents of the University of California.  All rights reserved.\n";
 #define SIGNAL_FLUSH_PCAP SIGUSR2
 #endif
 
 #define SIGNAL_FLUSH_PCAP SIGUSR2
 #endif
 

+#if defined(HAVE_PCAP_CREATE) || defined(_WIN32)

 static int Bflag;                      /* buffer size */
 static int Bflag;                      /* buffer size */

+#endif

 #ifdef HAVE_PCAP_DUMP_FTELL64
 static int64_t Cflag;                  /* rotate dump files after this many bytes */
 #else
 #ifdef HAVE_PCAP_DUMP_FTELL64
 static int64_t Cflag;                  /* rotate dump files after this many bytes */
 #else


@@ -186,13 +187,15 @@ static int Lflag;                 /* list available data link types and exit */
 static int Iflag;                      /* rfmon (monitor) mode */
 #ifdef HAVE_PCAP_SET_TSTAMP_TYPE
 static int Jflag;                      /* list available time stamp types */
 static int Iflag;                      /* rfmon (monitor) mode */
 #ifdef HAVE_PCAP_SET_TSTAMP_TYPE
 static int Jflag;                      /* list available time stamp types */

-#endif

 static int jflag = -1;                 /* packet time stamp source */
 static int jflag = -1;                 /* packet time stamp source */

+#endif

 static int pflag;                      /* don't go promiscuous */
 #ifdef HAVE_PCAP_SETDIRECTION
 static int Qflag = -1;                 /* restrict captured packet by send/receive direction */
 #endif
 static int pflag;                      /* don't go promiscuous */
 #ifdef HAVE_PCAP_SETDIRECTION
 static int Qflag = -1;                 /* restrict captured packet by send/receive direction */
 #endif

+#ifdef HAVE_PCAP_DUMP_FLUSH

 static int Uflag;                      /* "unbuffered" output of dump files */
 static int Uflag;                      /* "unbuffered" output of dump files */

+#endif

 static int Wflag;                      /* recycle output files after this number of files */
 static int WflagChars;
 static char *zflag = NULL;             /* compress each savefile using a specified command (like gzip or bzip2) */
 static int Wflag;                      /* recycle output files after this number of files */
 static int WflagChars;
 static char *zflag = NULL;             /* compress each savefile using a specified command (like gzip or bzip2) */


@@ -218,7 +221,9 @@ static void cleanup(int);
 static void child_cleanup(int);
 static void print_version(void);
 static void print_usage(void);
 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);
 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);
 static NORETURN void show_dlts_and_exit(pcap_t *, const char *device);
 #ifdef HAVE_PCAP_FINDALLDEVS
 static NORETURN void show_devices_and_exit(void);


@@ -732,50 +737,38 @@ droproot(const char *username, const char *chroot_dir)
 {
        struct passwd *pw = NULL;
 
 {
        struct passwd *pw = NULL;
 

-       if (chroot_dir && !username) {
-               fprintf(stderr, "%s: Chroot without dropping root is insecure\n",
-                       program_name);
-               exit_tcpdump(S_ERR_HOST_PROGRAM);
-       }
+       if (chroot_dir && !username)
+               error("Chroot without dropping root is insecure");

 
        pw = getpwnam(username);
        if (pw) {
                if (chroot_dir) {
 
        pw = getpwnam(username);
        if (pw) {
                if (chroot_dir) {

-                       if (chroot(chroot_dir) != 0 || chdir ("/") != 0) {
-                               fprintf(stderr, "%s: Couldn't chroot/chdir to '%.64s': %s\n",
-                                       program_name, chroot_dir, pcap_strerror(errno));
-                               exit_tcpdump(S_ERR_HOST_PROGRAM);
-                       }
+                       if (chroot(chroot_dir) != 0 || chdir ("/") != 0)
+                               error("Couldn't chroot/chdir to '%.64s': %s",
+                                     chroot_dir, pcap_strerror(errno));

                }
 #ifdef HAVE_LIBCAP_NG
                {
                        int ret = capng_change_id(pw->pw_uid, pw->pw_gid, CAPNG_NO_FLAG);
                }
 #ifdef HAVE_LIBCAP_NG
                {
                        int ret = capng_change_id(pw->pw_uid, pw->pw_gid, CAPNG_NO_FLAG);

-                       if (ret < 0) {
-                               fprintf(stderr, "error : ret %d\n", ret);
-                       } else {
+                       if (ret < 0)
+                               error("capng_change_id(): return %d\n", ret);
+                       else

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

-                       }

                }
 #else
                if (initgroups(pw->pw_name, pw->pw_gid) != 0 ||
                }
 #else
                if (initgroups(pw->pw_name, pw->pw_gid) != 0 ||

-                   setgid(pw->pw_gid) != 0 || setuid(pw->pw_uid) != 0) {
-                       fprintf(stderr, "%s: Couldn't change to '%.32s' uid=%lu gid=%lu: %s\n",
-                               program_name, username,
+                   setgid(pw->pw_gid) != 0 || setuid(pw->pw_uid) != 0)
+                       error("Couldn't change to '%.32s' uid=%lu gid=%lu: %s",
+                               username,

                                (unsigned long)pw->pw_uid,
                                (unsigned long)pw->pw_gid,
                                pcap_strerror(errno));
                                (unsigned long)pw->pw_uid,
                                (unsigned long)pw->pw_gid,
                                pcap_strerror(errno));

-                       exit_tcpdump(S_ERR_HOST_PROGRAM);
-               }

                else {
                        fprintf(stderr, "dropped privs to %s\n", username);
                }
 #endif /* HAVE_LIBCAP_NG */
                else {
                        fprintf(stderr, "dropped privs to %s\n", username);
                }
 #endif /* HAVE_LIBCAP_NG */

-       }
-       else {
-               fprintf(stderr, "%s: Couldn't find user '%.32s'\n",
-                       program_name, username);
-               exit_tcpdump(S_ERR_HOST_PROGRAM);
-       }
+       } else
+               error("Couldn't find user '%.32s'", username);

 #ifdef HAVE_LIBCAP_NG
        /* We don't need CAP_SETUID, CAP_SETGID and CAP_SYS_CHROOT any more. */
 DIAG_OFF_CLANG(assign-enum)
 #ifdef HAVE_LIBCAP_NG
        /* We don't need CAP_SETUID, CAP_SETGID and CAP_SYS_CHROOT any more. */
 DIAG_OFF_CLANG(assign-enum)


@@ -1119,7 +1112,11 @@ parse_interface_number(const char *device)
 }
 
 static char *
 }
 
 static char *

-find_interface_by_number(const char *url, long devnum)
+find_interface_by_number(const char *url
+#ifndef HAVE_PCAP_FINDALLDEVS_EX
+_U_
+#endif
+, long devnum)

 {
        pcap_if_t *dev, *devlist;
        long i;
 {
        pcap_if_t *dev, *devlist;
        long i;


@@ -1250,9 +1247,9 @@ open_interface(const char *device, netdissect_options *ndo, char *ebuf)
        status = pcap_set_tstamp_precision(pc, ndo->ndo_tstamp_precision);
        if (status != 0)
                error("%s: Can't set %ssecond time stamp precision: %s",
        status = pcap_set_tstamp_precision(pc, ndo->ndo_tstamp_precision);
        if (status != 0)
                error("%s: Can't set %ssecond time stamp precision: %s",

-                       device,
-                       tstamp_precision_to_string(ndo->ndo_tstamp_precision),
-                       pcap_statustostr(status));
+                   device,
+                   tstamp_precision_to_string(ndo->ndo_tstamp_precision),
+                   pcap_statustostr(status));

 #endif
 
 #ifdef HAVE_PCAP_SET_IMMEDIATE_MODE
 #endif
 
 #ifdef HAVE_PCAP_SET_IMMEDIATE_MODE


@@ -1260,8 +1257,7 @@ open_interface(const char *device, netdissect_options *ndo, char *ebuf)
                status = pcap_set_immediate_mode(pc, 1);
                if (status != 0)
                        error("%s: Can't set immediate mode: %s",
                status = pcap_set_immediate_mode(pc, 1);
                if (status != 0)
                        error("%s: Can't set immediate mode: %s",

-                       device,
-                       pcap_statustostr(status));
+                           device, pcap_statustostr(status));

        }
 #endif
        /*
        }
 #endif
        /*


@@ -1306,7 +1302,11 @@ open_interface(const char *device, netdissect_options *ndo, char *ebuf)
                status = pcap_set_tstamp_type(pc, jflag);
                if (status < 0)
                        error("%s: Can't set time stamp type: %s",
                status = pcap_set_tstamp_type(pc, jflag);
                if (status < 0)
                        error("%s: Can't set time stamp type: %s",

-                             device, pcap_statustostr(status));
+                           device, pcap_statustostr(status));
+               else if (status > 0)
+                       warning("When trying to set timestamp type '%s' on %s: %s",
+                           pcap_tstamp_type_val_to_name(jflag), device,
+                           pcap_statustostr(status));

        }
 #endif
        status = pcap_activate(pc);
        }
 #endif
        status = pcap_activate(pc);


@@ -1411,7 +1411,6 @@ main(int argc, char **argv)
 {
        int cnt, op, i;
        bpf_u_int32 localnet = 0, netmask = 0;
 {
        int cnt, op, i;
        bpf_u_int32 localnet = 0, netmask = 0;

-       int timezone_offset = 0;

        char *cp, *infile, *cmdbuf, *device, *RFileName, *VFileName, *WFileName;
        char *endp;
        pcap_handler callback;
        char *cp, *infile, *cmdbuf, *device, *RFileName, *VFileName, *WFileName;
        char *endp;
        pcap_handler callback;


@@ -1868,14 +1867,11 @@ main(int argc, char **argv)
        switch (ndo->ndo_tflag) {
 
        case 0: /* Default */
        switch (ndo->ndo_tflag) {
 
        case 0: /* Default */

-       case 4: /* Default + Date*/
-               timezone_offset = gmt2local(0);
-               break;
-

        case 1: /* No time stamp */
        case 2: /* Unix timeval style */
        case 1: /* No time stamp */
        case 2: /* Unix timeval style */

-       case 3: /* Microseconds since previous packet */
-        case 5: /* Microseconds since first packet */
+       case 3: /* Microseconds/nanoseconds since previous packet */
+       case 4: /* Date + Default */
+       case 5: /* Microseconds/nanoseconds since first packet */

                break;
 
        default: /* Not supported */
                break;
 
        default: /* Not supported */


@@ -1986,6 +1982,10 @@ main(int argc, char **argv)
                            RFileName, dlt_name,
                            pcap_datalink_val_to_description(dlt));
                }
                            RFileName, dlt_name,
                            pcap_datalink_val_to_description(dlt));
                }

+#ifdef DLT_LINUX_SLL2
+               if (dlt == DLT_LINUX_SLL2)
+                       fprintf(stderr, "Warning: interface names might be incorrect\n");
+#endif

        } else {
                /*
                 * We're doing a live capture.
        } else {
                /*
                 * We're doing a live capture.


@@ -2133,7 +2133,7 @@ main(int argc, char **argv)
                capdns = capdns_setup();
 #endif /* HAVE_CASPER */
 
                capdns = capdns_setup();
 #endif /* HAVE_CASPER */
 

-       init_print(ndo, localnet, netmask, timezone_offset);
+       init_print(ndo, localnet, netmask);

 
 #ifndef _WIN32
        (void)setsignal(SIGPIPE, cleanup);
 
 #ifndef _WIN32
        (void)setsignal(SIGPIPE, cleanup);