Use UTC/GMT time when building/checking tests files

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 0ef211171a9d14d8658e2c341e4c4ae1e63d887f..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 "gmt2local.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
 
+#if defined(HAVE_PCAP_CREATE) || defined(_WIN32)
 static int Bflag;                      /* buffer size */
+#endif
 #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 */
-#endif
 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
+#ifdef HAVE_PCAP_DUMP_FLUSH
 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) */
@@ -218,7 +221,9 @@ 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);
@@ -1242,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",
-                       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
@@ -1252,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",
-                       device,
-                       pcap_statustostr(status));
+                           device, pcap_statustostr(status));
        }
 #endif
        /*
@@ -1298,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",
-                             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);
@@ -1403,7 +1411,6 @@ main(int argc, char **argv)
 {
        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;
@@ -1860,14 +1867,11 @@ main(int argc, char **argv)
        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 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 */
@@ -2129,7 +2133,7 @@ main(int argc, char **argv)
                capdns = capdns_setup();
 #endif /* HAVE_CASPER */
 
-       init_print(ndo, localnet, netmask, timezone_offset);
+       init_print(ndo, localnet, netmask);
 
 #ifndef _WIN32
        (void)setsignal(SIGPIPE, cleanup);