add a short option '#', same as long option '--number' (print a packet number)

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 2a4e17c8f0e24096af2c9ee03e955e34be202e1d..11dc8bc8b854f356ccbe805ef0308357afbd637f 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -29,8 +29,6 @@
 static const char copyright[] _U_ =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char copyright[] _U_ =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
 The Regents of the University of California.  All rights reserved.\n";

-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.283 2008-09-25 21:45:50 guy Exp $ (LBL)";

 #endif
 
 /*
 #endif
 
 /*


@@ -48,7 +46,6 @@ static const char rcsid[] _U_ =
 #include <tcpdump-stdinc.h>
 
 #ifdef WIN32
 #include <tcpdump-stdinc.h>
 
 #ifdef WIN32

-#include "getopt.h"

 #include "w32_fzs.h"
 extern int strcasecmp (const char *__s1, const char *__s2);
 extern int SIZE_BUF;
 #include "w32_fzs.h"
 extern int strcasecmp (const char *__s1, const char *__s2);
 extern int SIZE_BUF;


@@ -60,18 +57,33 @@ extern int SIZE_BUF;
 #include <smi.h>
 #endif
 
 #include <smi.h>
 #endif
 

+#ifdef HAVE_LIBCRYPTO
+#include <openssl/crypto.h>
+#endif
+
+#ifdef HAVE_GETOPT_LONG
+#include <getopt.h>
+#else
+#include "getopt_long.h"
+#endif

 #include <pcap.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 #include <pcap.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>

+#ifdef HAVE_CAPSICUM
+#include <sys/capability.h>
+#include <sys/ioccom.h>
+#include <net/bpf.h>
+#include <fcntl.h>
+#include <libgen.h>
+#endif /* HAVE_CAPSICUM */

 #ifndef WIN32
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <pwd.h>
 #include <grp.h>
 #ifndef WIN32
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <pwd.h>
 #include <grp.h>

-#include <errno.h>

 #endif /* WIN32 */
 
 /* capabilities convinience library */
 #endif /* WIN32 */
 
 /* capabilities convinience library */


@@ -100,13 +112,14 @@ extern int SIZE_BUF;
 netdissect_options Gndo;
 netdissect_options *gndo = &Gndo;
 
 netdissect_options Gndo;
 netdissect_options *gndo = &Gndo;
 

+static int Dflag;                      /* list available devices and exit */

 static int dflag;                      /* print filter code */
 static int Lflag;                      /* list available data link types and exit */
 #ifdef HAVE_PCAP_SET_TSTAMP_TYPE
 static int Jflag;                      /* list available time stamp types */
 #endif
 #ifdef HAVE_PCAP_SETDIRECTION
 static int dflag;                      /* print filter code */
 static int Lflag;                      /* list available data link types and exit */
 #ifdef HAVE_PCAP_SET_TSTAMP_TYPE
 static int Jflag;                      /* list available time stamp types */
 #endif
 #ifdef HAVE_PCAP_SETDIRECTION

-int Pflag = -1;        /* Restrict captured packet by sent/receive direction */
+int Qflag = -1;                                /* restrict captured packet by send/receive direction */

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


@@ -120,7 +133,8 @@ int32_t thiszone;           /* seconds offset from gmt to local time */
 /* Forwards */
 static RETSIGTYPE cleanup(int);
 static RETSIGTYPE child_cleanup(int);
 /* Forwards */
 static RETSIGTYPE cleanup(int);
 static RETSIGTYPE child_cleanup(int);

-static void usage(void) __attribute__((noreturn));
+static void print_version(void);
+static void print_usage(void);

 static void show_dlts_and_exit(const char *device, pcap_t *pd) __attribute__((noreturn));
 
 static void print_packet(u_char *, const struct pcap_pkthdr *, const u_char *);
 static void show_dlts_and_exit(const char *device, pcap_t *pd) __attribute__((noreturn));
 
 static void print_packet(u_char *, const struct pcap_pkthdr *, const u_char *);


@@ -129,8 +143,16 @@ static void dump_packet_and_trunc(u_char *, const struct pcap_pkthdr *, const u_
 static void dump_packet(u_char *, const struct pcap_pkthdr *, const u_char *);
 static void droproot(const char *, const char *);
 static void ndo_error(netdissect_options *ndo, const char *fmt, ...)
 static void dump_packet(u_char *, const struct pcap_pkthdr *, const u_char *);
 static void droproot(const char *, const char *);
 static void ndo_error(netdissect_options *ndo, const char *fmt, ...)

-     __attribute__ ((noreturn, format (printf, 2, 3)));
-static void ndo_warning(netdissect_options *ndo, const char *fmt, ...);
+     __attribute__((noreturn))
+#ifdef __ATTRIBUTE___FORMAT_OK
+     __attribute__((format (printf, 2, 3)))
+#endif /* __ATTRIBUTE___FORMAT_OK */
+    ;
+static void ndo_warning(netdissect_options *ndo, const char *fmt, ...)
+#ifdef __ATTRIBUTE___FORMAT_OK
+     __attribute__((format (printf, 2, 3)))
+#endif /* __ATTRIBUTE___FORMAT_OK */
+    ;

 
 #ifdef SIGNAL_REQ_INFO
 RETSIGTYPE requestinfo(int);
 
 #ifdef SIGNAL_REQ_INFO
 RETSIGTYPE requestinfo(int);


@@ -159,14 +181,32 @@ struct ndo_printer {
 };
 
 
 };
 
 

-static struct printer printers[] = {
-       { arcnet_if_print,      DLT_ARCNET },
-#ifdef DLT_ARCNET_LINUX
-       { arcnet_linux_if_print, DLT_ARCNET_LINUX },
+static const struct printer printers[] = {
+       { NULL,                 0 },
+};
+
+static const struct ndo_printer ndo_printers[] = {
+       { ether_if_print,       DLT_EN10MB },
+#ifdef DLT_IPNET
+       { ipnet_if_print,       DLT_IPNET },

 #endif
 #endif

-       { token_if_print,       DLT_IEEE802 },
-#ifdef DLT_LANE8023
-       { lane_if_print,        DLT_LANE8023 },
+#ifdef DLT_IEEE802_15_4
+       { ieee802_15_4_if_print, DLT_IEEE802_15_4 },
+#endif
+#ifdef DLT_IEEE802_15_4_NOFCS
+       { ieee802_15_4_if_print, DLT_IEEE802_15_4_NOFCS },
+#endif
+#ifdef DLT_PPI
+       { ppi_if_print,         DLT_PPI },
+#endif
+#ifdef DLT_NETANALYZER
+       { netanalyzer_if_print, DLT_NETANALYZER },
+#endif
+#ifdef DLT_NETANALYZER_TRANSPARENT
+       { netanalyzer_transparent_if_print, DLT_NETANALYZER_TRANSPARENT },
+#endif
+#if defined(DLT_NFLOG) && defined(HAVE_PCAP_NFLOG_H)
+       { nflog_if_print,       DLT_NFLOG},

 #endif
 #ifdef DLT_CIP
        { cip_if_print,         DLT_CIP },
 #endif
 #ifdef DLT_CIP
        { cip_if_print,         DLT_CIP },


@@ -174,47 +214,60 @@ static struct printer printers[] = {
 #ifdef DLT_ATM_CLIP
        { cip_if_print,         DLT_ATM_CLIP },
 #endif
 #ifdef DLT_ATM_CLIP
        { cip_if_print,         DLT_ATM_CLIP },
 #endif

-       { sl_if_print,          DLT_SLIP },
-#ifdef DLT_SLIP_BSDOS
-       { sl_bsdos_if_print,    DLT_SLIP_BSDOS },
-#endif
-       { ppp_if_print,         DLT_PPP },
-#ifdef DLT_PPP_WITHDIRECTION
-       { ppp_if_print,         DLT_PPP_WITHDIRECTION },
-#endif
-#ifdef DLT_PPP_BSDOS
-       { ppp_bsdos_if_print,   DLT_PPP_BSDOS },
+#ifdef DLT_IP_OVER_FC
+       { ipfc_if_print,        DLT_IP_OVER_FC },

 #endif
 #endif

-       { fddi_if_print,        DLT_FDDI },

        { null_if_print,        DLT_NULL },
 #ifdef DLT_LOOP
        { null_if_print,        DLT_LOOP },
        { null_if_print,        DLT_NULL },
 #ifdef DLT_LOOP
        { null_if_print,        DLT_LOOP },

+#endif
+#ifdef DLT_APPLE_IP_OVER_IEEE1394
+       { ap1394_if_print,      DLT_APPLE_IP_OVER_IEEE1394 },
+#endif
+#if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H)
+       { bt_if_print,          DLT_BLUETOOTH_HCI_H4_WITH_PHDR},
+#endif
+#ifdef DLT_LANE8023
+       { lane_if_print,        DLT_LANE8023 },
+#endif
+       { arcnet_if_print,      DLT_ARCNET },
+#ifdef DLT_ARCNET_LINUX
+       { arcnet_linux_if_print, DLT_ARCNET_LINUX },

 #endif
        { raw_if_print,         DLT_RAW },
 #endif
        { raw_if_print,         DLT_RAW },

-       { atm_if_print,         DLT_ATM_RFC1483 },
+#ifdef DLT_IPV4
+       { raw_if_print,         DLT_IPV4 },
+#endif
+#ifdef DLT_IPV6
+       { raw_if_print,         DLT_IPV6 },
+#endif
+#ifdef HAVE_PCAP_USB_H
+#ifdef DLT_USB_LINUX
+       { usb_linux_48_byte_print, DLT_USB_LINUX},
+#endif /* DLT_USB_LINUX */
+#ifdef DLT_USB_LINUX_MMAPPED
+       { usb_linux_64_byte_print, DLT_USB_LINUX_MMAPPED},
+#endif /* DLT_USB_LINUX_MMAPPED */
+#endif /* HAVE_PCAP_USB_H */
+#ifdef DLT_SYMANTEC_FIREWALL
+       { symantec_if_print,    DLT_SYMANTEC_FIREWALL },
+#endif

 #ifdef DLT_C_HDLC
        { chdlc_if_print,       DLT_C_HDLC },
 #endif
 #ifdef DLT_HDLC
        { chdlc_if_print,       DLT_HDLC },
 #endif
 #ifdef DLT_C_HDLC
        { chdlc_if_print,       DLT_C_HDLC },
 #endif
 #ifdef DLT_HDLC
        { chdlc_if_print,       DLT_HDLC },
 #endif

-#ifdef DLT_PPP_SERIAL
-       { ppp_hdlc_if_print,    DLT_PPP_SERIAL },
-#endif

 #ifdef DLT_PPP_ETHER
        { pppoe_if_print,       DLT_PPP_ETHER },
 #endif
 #ifdef DLT_PPP_ETHER
        { pppoe_if_print,       DLT_PPP_ETHER },
 #endif

-#ifdef DLT_LINUX_SLL
-       { sll_if_print,         DLT_LINUX_SLL },
-#endif
-#ifdef DLT_IEEE802_11
-       { ieee802_11_if_print,  DLT_IEEE802_11},
-#endif
-#ifdef DLT_LTALK
-       { ltalk_if_print,       DLT_LTALK },
-#endif

 #if defined(DLT_PFLOG) && defined(HAVE_NET_PFVAR_H)
        { pflog_if_print,       DLT_PFLOG },
 #if defined(DLT_PFLOG) && defined(HAVE_NET_PFVAR_H)
        { pflog_if_print,       DLT_PFLOG },

+#endif
+       { token_if_print,       DLT_IEEE802 },
+       { fddi_if_print,        DLT_FDDI },
+#ifdef DLT_LINUX_SLL
+       { sll_if_print,         DLT_LINUX_SLL },

 #endif
 #ifdef DLT_FR
        { fr_if_print,          DLT_FR },
 #endif
 #ifdef DLT_FR
        { fr_if_print,          DLT_FR },


@@ -222,29 +275,22 @@ static struct printer printers[] = {
 #ifdef DLT_FRELAY
        { fr_if_print,          DLT_FRELAY },
 #endif
 #ifdef DLT_FRELAY
        { fr_if_print,          DLT_FRELAY },
 #endif

+#ifdef DLT_MFR
+       { mfr_if_print,         DLT_MFR },
+#endif
+       { atm_if_print,         DLT_ATM_RFC1483 },

 #ifdef DLT_SUNATM
        { sunatm_if_print,      DLT_SUNATM },
 #endif
 #ifdef DLT_SUNATM
        { sunatm_if_print,      DLT_SUNATM },
 #endif

-#ifdef DLT_IP_OVER_FC
-       { ipfc_if_print,        DLT_IP_OVER_FC },
-#endif
-#ifdef DLT_PRISM_HEADER
-       { prism_if_print,       DLT_PRISM_HEADER },
-#endif
-#ifdef DLT_IEEE802_11_RADIO
-       { ieee802_11_radio_if_print,    DLT_IEEE802_11_RADIO },
-#endif

 #ifdef DLT_ENC
        { enc_if_print,         DLT_ENC },
 #endif
 #ifdef DLT_ENC
        { enc_if_print,         DLT_ENC },
 #endif

-#ifdef DLT_SYMANTEC_FIREWALL
-       { symantec_if_print,    DLT_SYMANTEC_FIREWALL },
-#endif
-#ifdef DLT_APPLE_IP_OVER_IEEE1394
-       { ap1394_if_print,      DLT_APPLE_IP_OVER_IEEE1394 },
+       { sl_if_print,          DLT_SLIP },
+#ifdef DLT_SLIP_BSDOS
+       { sl_bsdos_if_print,    DLT_SLIP_BSDOS },

 #endif
 #endif

-#ifdef DLT_IEEE802_11_RADIO_AVS
-       { ieee802_11_radio_avs_if_print,        DLT_IEEE802_11_RADIO_AVS },
+#ifdef DLT_LTALK
+       { ltalk_if_print,       DLT_LTALK },

 #endif
 #ifdef DLT_JUNIPER_ATM1
        { juniper_atm1_print,   DLT_JUNIPER_ATM1 },
 #endif
 #ifdef DLT_JUNIPER_ATM1
        { juniper_atm1_print,   DLT_JUNIPER_ATM1 },


@@ -291,59 +337,49 @@ static struct printer printers[] = {
 #ifdef DLT_JUNIPER_CHDLC
        { juniper_chdlc_print,  DLT_JUNIPER_CHDLC },
 #endif
 #ifdef DLT_JUNIPER_CHDLC
        { juniper_chdlc_print,  DLT_JUNIPER_CHDLC },
 #endif

-#ifdef DLT_MFR
-       { mfr_if_print,         DLT_MFR },
+#ifdef DLT_PKTAP
+       { pktap_if_print,       DLT_PKTAP },

 #endif
 #endif

-#if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H)
-       { bt_if_print,          DLT_BLUETOOTH_HCI_H4_WITH_PHDR},
-#endif
-#ifdef HAVE_PCAP_USB_H
-#ifdef DLT_USB_LINUX
-       { usb_linux_48_byte_print, DLT_USB_LINUX},
-#endif /* DLT_USB_LINUX */
-#ifdef DLT_USB_LINUX_MMAPPED
-       { usb_linux_64_byte_print, DLT_USB_LINUX_MMAPPED},
-#endif /* DLT_USB_LINUX_MMAPPED */
-#endif /* HAVE_PCAP_USB_H */
-#ifdef DLT_IPV4
-       { raw_if_print,         DLT_IPV4 },
+#ifdef DLT_IEEE802_11_RADIO
+       { ieee802_11_radio_if_print,    DLT_IEEE802_11_RADIO },

 #endif
 #endif

-#ifdef DLT_IPV6
-       { raw_if_print,         DLT_IPV6 },
+#ifdef DLT_IEEE802_11
+       { ieee802_11_if_print,  DLT_IEEE802_11},

 #endif
 #endif

-       { NULL,                 0 },
-};
-
-static struct ndo_printer ndo_printers[] = {
-       { ether_if_print,       DLT_EN10MB },
-#ifdef DLT_IPNET
-       { ipnet_if_print,       DLT_IPNET },
+#ifdef DLT_IEEE802_11_RADIO_AVS
+       { ieee802_11_radio_avs_if_print,        DLT_IEEE802_11_RADIO_AVS },

 #endif
 #endif

-#ifdef DLT_IEEE802_15_4
-       { ieee802_15_4_if_print, DLT_IEEE802_15_4 },
+#ifdef DLT_PRISM_HEADER
+       { prism_if_print,       DLT_PRISM_HEADER },

 #endif
 #endif

-#ifdef DLT_IEEE802_15_4_NOFCS
-       { ieee802_15_4_if_print, DLT_IEEE802_15_4_NOFCS },
+       { ppp_if_print,         DLT_PPP },
+#ifdef DLT_PPP_WITHDIRECTION
+       { ppp_if_print,         DLT_PPP_WITHDIRECTION },

 #endif
 #endif

-#ifdef DLT_PPI
-       { ppi_if_print,         DLT_PPI },
+#ifdef DLT_PPP_BSDOS
+       { ppp_bsdos_if_print,   DLT_PPP_BSDOS },

 #endif
 #endif

-#ifdef DLT_NETANALYZER
-       { netanalyzer_if_print, DLT_NETANALYZER },
+#ifdef DLT_PPP_SERIAL
+       { ppp_hdlc_if_print,    DLT_PPP_SERIAL },

 #endif
 #endif

-#ifdef DLT_NETANALYZER_TRANSPARENT
-       { netanalyzer_transparent_if_print, DLT_NETANALYZER_TRANSPARENT },
+       { NULL,                 0 },
+};
+
+static const struct tok status_flags[] = {
+#ifdef PCAP_IF_UP
+       { PCAP_IF_UP,       "Up"       },

 #endif
 #endif

-#ifdef DLT_NFLOG
-       { nflog_if_print,       DLT_NFLOG},
+#ifdef PCAP_IF_RUNNING
+       { PCAP_IF_RUNNING,  "Running"  },

 #endif
 #endif

-       { NULL,                 0 },
+       { PCAP_IF_LOOPBACK, "Loopback" },
+       { 0, NULL }

 };
 
 if_printer
 lookup_printer(int type)
 {
 };
 
 if_printer
 lookup_printer(int type)
 {

-       struct printer *p;
+       const struct printer *p;

 
        for (p = printers; p->f; ++p)
                if (type == p->type)
 
        for (p = printers; p->f; ++p)
                if (type == p->type)


@@ -356,12 +392,36 @@ lookup_printer(int type)
 if_ndo_printer
 lookup_ndo_printer(int type)
 {
 if_ndo_printer
 lookup_ndo_printer(int type)
 {

-       struct ndo_printer *p;
+       const struct ndo_printer *p;

 
        for (p = ndo_printers; p->f; ++p)
                if (type == p->type)
                        return p->f;
 
 
        for (p = ndo_printers; p->f; ++p)
                if (type == p->type)
                        return p->f;
 

+#if defined(DLT_USER2) && defined(DLT_PKTAP)
+       /*
+        * Apple incorrectly chose to use DLT_USER2 for their PKTAP
+        * header.
+        *
+        * We map DLT_PKTAP, whether it's DLT_USER2 as it is on Darwin-
+        * based OSes or the same value as LINKTYPE_PKTAP as it is on
+        * other OSes, to LINKTYPE_PKTAP, so files written with
+        * this version of libpcap for a DLT_PKTAP capture have a link-
+        * layer header type of LINKTYPE_PKTAP.
+        *
+        * However, files written on OS X Mavericks for a DLT_PKTAP
+        * capture have a link-layer header type of LINKTYPE_USER2.
+        * If we don't have a printer for DLT_USER2, and type is
+        * DLT_USER2, we look up the printer for DLT_PKTAP and use
+        * that.
+        */
+       if (type == DLT_USER2) {
+               for (p = ndo_printers; p->f; ++p)
+                       if (DLT_PKTAP == p->type)
+                               return p->f;
+       }
+#endif
+

        return NULL;
        /* NOTREACHED */
 }
        return NULL;
        /* NOTREACHED */
 }


@@ -388,6 +448,9 @@ struct dump_info {
        char    *CurrentFileName;
        pcap_t  *pd;
        pcap_dumper_t *p;
        char    *CurrentFileName;
        pcap_t  *pd;
        pcap_dumper_t *p;

+#ifdef HAVE_CAPSICUM
+       int     dirfd;
+#endif

 };
 
 #ifdef HAVE_PCAP_SET_TSTAMP_TYPE
 };
 
 #ifdef HAVE_PCAP_SET_TSTAMP_TYPE


@@ -477,6 +540,52 @@ show_dlts_and_exit(const char *device, pcap_t *pd)
        exit(0);
 }
 
        exit(0);
 }
 

+#ifdef HAVE_PCAP_FINDALLDEVS
+static void
+show_devices_and_exit (void)
+{
+       pcap_if_t *devpointer;
+       char ebuf[PCAP_ERRBUF_SIZE];
+       int i;
+
+       if (pcap_findalldevs(&devpointer, ebuf) < 0)
+               error("%s", ebuf);
+       else {
+               for (i = 0; devpointer != NULL; i++) {
+                       printf("%d.%s", i+1, devpointer->name);
+                       if (devpointer->description != NULL)
+                               printf(" (%s)", devpointer->description);
+                       if (devpointer->flags != 0)
+                               printf(" [%s]", bittok2str(status_flags, "none", devpointer->flags));
+                       printf("\n");
+                       devpointer = devpointer->next;
+               }
+       }
+       exit(0);
+}
+#endif /* HAVE_PCAP_FINDALLDEVS */
+
+/*
+ * Short options.
+ *
+ * Note that there we use all letters for short options except for g, k,
+ * o, and P, and those are used by other versions of tcpdump, and we should
+ * only use them for the same purposes that the other versions of tcpdump
+ * use them:
+ *
+ * OS X tcpdump uses -g to force non--v output for IP to be on one
+ * line, making it more "g"repable;
+ *
+ * OS X tcpdump uses -k tospecify that packet comments in pcap-ng files
+ * should be printed;
+ *
+ * OpenBSD tcpdump uses -o to indicate that OS fingerprinting should be done
+ * for hosts sending TCP SYN packets;
+ *
+ * OS X tcpdump uses -P to indicate that -w should write pcap-ng rather
+ * than pcap files.
+ */
+

 /*
  * Set up flags that might or might not be supported depending on the
  * version of libpcap we're using.
 /*
  * Set up flags that might or might not be supported depending on the
  * version of libpcap we're using.


@@ -524,10 +633,72 @@ show_dlts_and_exit(const char *device, pcap_t *pd)
 #endif
 
 #ifdef HAVE_PCAP_SETDIRECTION
 #endif
 
 #ifdef HAVE_PCAP_SETDIRECTION

-#define P_FLAG "P:"
+#define Q_FLAG "Q:"

 #else
 #else

-#define P_FLAG
+#define Q_FLAG
+#endif
+
+/*
+ * Long options.
+ *
+ * We do not currently have long options corresponding to all short
+ * options; we should probably pick appropriate option names for them.
+ *
+ * However, the short options where the number of times the option is
+ * specified matters, such as -v and -d and -t, should probably not
+ * just map to a long option, as saying
+ *
+ *  tcpdump --verbose --verbose
+ *
+ * doesn't make sense; it should be --verbosity={N} or something such
+ * as that.
+ *
+ * For long options with no corresponding short options, we define values
+ * outside the range of ASCII graphic characters, make that the last
+ * component of the entry for the long option, and have a case for that
+ * option in the switch statement.
+ */
+#define OPTION_VERSION         128
+#define OPTION_TSTAMP_PRECISION        129
+
+static const struct option longopts[] = {
+#if defined(HAVE_PCAP_CREATE) || defined(WIN32)
+       { "buffer-size", required_argument, NULL, 'B' },
+#endif
+       { "list-interfaces", no_argument, NULL, 'D' },
+       { "help", no_argument, NULL, 'h' },
+       { "interface", required_argument, NULL, 'i' },
+#ifdef HAVE_PCAP_CREATE
+       { "monitor-mode", no_argument, NULL, 'I' },

 #endif
 #endif

+#ifdef HAVE_PCAP_SET_TSTAMP_TYPE
+       { "time-stamp-type", required_argument, NULL, 'j' },
+       { "list-time-stamp-types", no_argument, NULL, 'J' },
+#endif
+#ifdef HAVE_PCAP_SET_TSTAMP_PRECISION
+       { "time-stamp-precision", required_argument, NULL, OPTION_TSTAMP_PRECISION},
+#endif
+       { "dont-verify-checksums", no_argument, NULL, 'K' },
+       { "list-data-link-types", no_argument, NULL, 'L' },
+       { "no-optimize", no_argument, NULL, 'O' },
+       { "no-promiscuous-mode", no_argument, NULL, 'p' },
+#ifdef HAVE_PCAP_SETDIRECTION
+       { "direction", required_argument, NULL, 'Q' },
+#endif
+       { "snapshot-length", required_argument, NULL, 's' },
+       { "absolute-tcp-sequence-numbers", no_argument, NULL, 'S' },
+#ifdef HAVE_PCAP_DUMP_FLUSH
+       { "packet-buffered", no_argument, NULL, 'U' },
+#endif
+       { "linktype", required_argument, NULL, 'y' },
+#if defined(HAVE_PCAP_DEBUG) || defined(HAVE_YYDEBUG)
+       { "debug-filter-parser", no_argument, NULL, 'Y' },
+#endif
+       { "relinquish-privileges", required_argument, NULL, 'Z' },
+       { "number", no_argument, NULL, '#' },
+       { "version", no_argument, NULL, OPTION_VERSION },
+       { NULL, 0, NULL, 0 }
+};

 
 #ifndef WIN32
 /* Drop root privileges and chroot if necessary */
 
 #ifndef WIN32
 /* Drop root privileges and chroot if necessary */


@@ -540,7 +711,7 @@ droproot(const char *username, const char *chroot_dir)
                fprintf(stderr, "tcpdump: Chroot without dropping root is insecure\n");
                exit(1);
        }
                fprintf(stderr, "tcpdump: Chroot without dropping root is insecure\n");
                exit(1);
        }

-       
+

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


@@ -553,7 +724,10 @@ droproot(const char *username, const char *chroot_dir)
 #ifdef HAVE_CAP_NG_H
                int ret = capng_change_id(pw->pw_uid, pw->pw_gid, CAPNG_NO_FLAG);
                if (ret < 0) {
 #ifdef HAVE_CAP_NG_H
                int ret = capng_change_id(pw->pw_uid, pw->pw_gid, CAPNG_NO_FLAG);
                if (ret < 0) {

-                       printf("error : ret %d\n", ret);
+                       fprintf(stderr, "error : ret %d\n", ret);
+               }
+               else {
+                       printf("dropped privs to %s\n", username);

                }
                /* We don't need CAP_SETUID and CAP_SETGID */
                capng_update(CAPNG_DROP, CAPNG_EFFECTIVE, CAP_SETUID);
                }
                /* We don't need CAP_SETUID and CAP_SETGID */
                capng_update(CAPNG_DROP, CAPNG_EFFECTIVE, CAP_SETUID);


@@ -566,12 +740,15 @@ droproot(const char *username, const char *chroot_dir)
                if (initgroups(pw->pw_name, pw->pw_gid) != 0 ||
                    setgid(pw->pw_gid) != 0 || setuid(pw->pw_uid) != 0) {
                        fprintf(stderr, "tcpdump: Couldn't change to '%.32s' uid=%lu gid=%lu: %s\n",
                if (initgroups(pw->pw_name, pw->pw_gid) != 0 ||
                    setgid(pw->pw_gid) != 0 || setuid(pw->pw_uid) != 0) {
                        fprintf(stderr, "tcpdump: Couldn't change to '%.32s' uid=%lu gid=%lu: %s\n",

-                           username, 
+                           username,

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

+               else {
+                       printf("dropped privs to %s\n", username);
+               }

 #endif /* HAVE_CAP_NG_H */
        }
        else {
 #endif /* HAVE_CAP_NG_H */
        }
        else {


@@ -633,7 +810,7 @@ MakeFilename(char *buffer, char *orig_name, int cnt, int max_chars)
 static int tcpdump_printf(netdissect_options *ndo _U_,
                          const char *fmt, ...)
 {
 static int tcpdump_printf(netdissect_options *ndo _U_,
                          const char *fmt, ...)
 {

-  
+

   va_list args;
   int ret;
 
   va_list args;
   int ret;
 


@@ -682,11 +859,41 @@ get_next_file(FILE *VFile, char *ptr)
        return ret;
 }
 
        return ret;
 }
 

+#ifdef HAVE_PCAP_SET_TSTAMP_PRECISION
+static int
+tstamp_precision_from_string(const char *precision)
+{
+       if (strncmp(precision, "nano", strlen("nano")) == 0)
+               return PCAP_TSTAMP_PRECISION_NANO;
+
+       if (strncmp(precision, "micro", strlen("micro")) == 0)
+               return PCAP_TSTAMP_PRECISION_MICRO;
+
+       return -EINVAL;
+}
+
+static const char *
+tstamp_precision_to_string(int precision)
+{
+       switch (precision) {
+
+       case PCAP_TSTAMP_PRECISION_MICRO:
+               return "micro";
+
+       case PCAP_TSTAMP_PRECISION_NANO:
+               return "nano";
+
+       default:
+               return "unknown";
+       }
+}
+#endif
+

 int
 main(int argc, char **argv)
 {
        register int cnt, op, i;
 int
 main(int argc, char **argv)
 {
        register int cnt, op, i;

-       bpf_u_int32 localnet, netmask;
+       bpf_u_int32 localnet =0 , netmask = 0;

        register char *cp, *infile, *cmdbuf, *device, *RFileName, *VFileName, *WFileName;
        pcap_handler callback;
        int type;
        register char *cp, *infile, *cmdbuf, *device, *RFileName, *VFileName, *WFileName;
        pcap_handler callback;
        int type;


@@ -712,6 +919,11 @@ main(int argc, char **argv)
 #endif
        int status;
        FILE *VFile;
 #endif
        int status;
        FILE *VFile;

+#ifdef HAVE_CAPSICUM
+       cap_rights_t rights;
+       int cansandbox;
+#endif /* HAVE_CAPSICUM */
+

 #ifdef WIN32
        if(wsockinit() != 0) return 1;
 #endif /* WIN32 */
 #ifdef WIN32
        if(wsockinit() != 0) return 1;
 #endif /* WIN32 */


@@ -725,7 +937,7 @@ main(int argc, char **argv)
        gndo->ndo_error=ndo_error;
        gndo->ndo_warning=ndo_warning;
        gndo->ndo_snaplen = DEFAULT_SNAPLEN;
        gndo->ndo_error=ndo_error;
        gndo->ndo_warning=ndo_warning;
        gndo->ndo_snaplen = DEFAULT_SNAPLEN;

-  
+

        cnt = -1;
        device = NULL;
        infile = NULL;
        cnt = -1;
        device = NULL;
        infile = NULL;


@@ -747,7 +959,7 @@ main(int argc, char **argv)
 #endif
 
        while (
 #endif
 
        while (

-           (op = getopt(argc, argv, "aAb" B_FLAG "c:C:d" D_FLAG "eE:fF:G:hHi:" I_FLAG j_FLAG J_FLAG "KlLm:M:nNOp" P_FLAG "qr:Rs:StT:u" U_FLAG "V:vw:W:xXy:Yz:Z:")) != -1)
+           (op = getopt_long(argc, argv, "aAb" B_FLAG "c:C:d" D_FLAG "eE:fF:G:hHi:" I_FLAG j_FLAG J_FLAG "KlLm:M:nNOpq" Q_FLAG "r:Rs:StT:u" U_FLAG "vV:w:W:xXy:Yz:Z:#", longopts, NULL)) != -1)

                switch (op) {
 
                case 'a':
                switch (op) {
 
                case 'a':


@@ -786,21 +998,9 @@ main(int argc, char **argv)
                        ++dflag;
                        break;
 
                        ++dflag;
                        break;
 

-#ifdef HAVE_PCAP_FINDALLDEVS

                case 'D':
                case 'D':

-                       if (pcap_findalldevs(&devpointer, ebuf) < 0)
-                               error("%s", ebuf);
-                       else {
-                               for (i = 0; devpointer != 0; i++) {
-                                       printf("%d.%s", i+1, devpointer->name);
-                                       if (devpointer->description != NULL)
-                                               printf(" (%s)", devpointer->description);
-                                       printf("\n");
-                                       devpointer = devpointer->next;
-                               }
-                       }
-                       return 0;
-#endif /* HAVE_PCAP_FINDALLDEVS */
+                       Dflag++;
+                       break;

 
                case 'L':
                        Lflag++;
 
                case 'L':
                        Lflag++;


@@ -841,7 +1041,8 @@ main(int argc, char **argv)
                        break;
 
                case 'h':
                        break;
 
                case 'h':

-                       usage();
+                       print_usage();
+                       exit(0);

                        break;
 
                case 'H':
                        break;
 
                case 'H':


@@ -851,7 +1052,7 @@ main(int argc, char **argv)
                case 'i':
                        if (optarg[0] == '0' && optarg[1] == 0)
                                error("Invalid adapter index");
                case 'i':
                        if (optarg[0] == '0' && optarg[1] == 0)
                                error("Invalid adapter index");

-                       
+

 #ifdef HAVE_PCAP_FINDALLDEVS
                        /*
                         * If the argument is a number, treat it as
 #ifdef HAVE_PCAP_FINDALLDEVS
                        /*
                         * If the argument is a number, treat it as


@@ -969,22 +1170,24 @@ main(int argc, char **argv)
                case 'p':
                        ++pflag;
                        break;
                case 'p':
                        ++pflag;
                        break;

+
+               case 'q':
+                       ++qflag;
+                       ++suppress_default_print;
+                       break;
+

 #ifdef HAVE_PCAP_SETDIRECTION
 #ifdef HAVE_PCAP_SETDIRECTION

-               case 'P':
+               case 'Q':

                        if (strcasecmp(optarg, "in") == 0)
                        if (strcasecmp(optarg, "in") == 0)

-                               Pflag = PCAP_D_IN;
+                               Qflag = PCAP_D_IN;

                        else if (strcasecmp(optarg, "out") == 0)
                        else if (strcasecmp(optarg, "out") == 0)

-                               Pflag = PCAP_D_OUT;
+                               Qflag = PCAP_D_OUT;

                        else if (strcasecmp(optarg, "inout") == 0)
                        else if (strcasecmp(optarg, "inout") == 0)

-                               Pflag = PCAP_D_INOUT;
+                               Qflag = PCAP_D_INOUT;

                        else
                                error("unknown capture direction `%s'", optarg);
                        break;
 #endif /* HAVE_PCAP_SETDIRECTION */
                        else
                                error("unknown capture direction `%s'", optarg);
                        break;
 #endif /* HAVE_PCAP_SETDIRECTION */

-               case 'q':
-                       ++qflag;
-                       ++suppress_default_print;
-                       break;

 
                case 'r':
                        RFileName = optarg;
 
                case 'r':
                        RFileName = optarg;


@@ -1072,7 +1275,7 @@ main(int argc, char **argv)
 
                case 'W':
                        Wflag = atoi(optarg);
 
                case 'W':
                        Wflag = atoi(optarg);

-                       if (Wflag < 0) 
+                       if (Wflag < 0)

                                error("invalid number of output files %s", optarg);
                        WflagChars = getWflagChars(Wflag);
                        break;
                                error("invalid number of output files %s", optarg);
                        WflagChars = getWflagChars(Wflag);
                        break;


@@ -1110,29 +1313,41 @@ main(int argc, char **argv)
                        break;
 #endif
                case 'z':
                        break;
 #endif
                case 'z':

-                       if (optarg) {
-                               zflag = strdup(optarg);
-                       } else {
-                               usage();
-                               /* NOTREACHED */
-                       }
+                       zflag = strdup(optarg);

                        break;
 
                case 'Z':
                        break;
 
                case 'Z':

-                       if (optarg) {
-                               username = strdup(optarg);
-                       }
-                       else {
-                               usage();
-                               /* NOTREACHED */
-                       }
+                       username = strdup(optarg);
+                       break;
+
+               case '#':
+                       gndo->ndo_packet_number = 1;

                        break;
 
                        break;
 

+               case OPTION_VERSION:
+                       print_version();
+                       exit(0);
+                       break;
+
+#ifdef HAVE_PCAP_SET_TSTAMP_PRECISION
+               case OPTION_TSTAMP_PRECISION:
+                       gndo->ndo_tstamp_precision = tstamp_precision_from_string(optarg);
+                       if (gndo->ndo_tstamp_precision < 0)
+                               error("unsupported time stamp precision");
+                       break;
+#endif
+

                default:
                default:

-                       usage();
+                       print_usage();
+                       exit(1);

                        /* NOTREACHED */
                }
 
                        /* NOTREACHED */
                }
 

+#ifdef HAVE_PCAP_FINDALLDEVS
+       if (Dflag)
+               show_devices_and_exit();
+#endif
+

        switch (tflag) {
 
        case 0: /* Default */
        switch (tflag) {
 
        case 0: /* Default */


@@ -1169,7 +1384,7 @@ main(int argc, char **argv)
 #ifdef WITH_USER
        /* if run as root, prepare for dropping root privileges */
        if (getuid() == 0 || geteuid() == 0) {
 #ifdef WITH_USER
        /* if run as root, prepare for dropping root privileges */
        if (getuid() == 0 || geteuid() == 0) {

-               /* Run with '-Z root' to restore old behaviour */ 
+               /* Run with '-Z root' to restore old behaviour */

                if (!username)
                        username = WITH_USER;
        }
                if (!username)
                        username = WITH_USER;
        }


@@ -1213,9 +1428,22 @@ main(int argc, char **argv)
                        RFileName = VFileLine;
                }
 
                        RFileName = VFileLine;
                }
 

+#ifdef HAVE_PCAP_SET_TSTAMP_PRECISION
+               pd = pcap_open_offline_with_tstamp_precision(RFileName,
+                   gndo->ndo_tstamp_precision, ebuf);
+#else

                pd = pcap_open_offline(RFileName, ebuf);
                pd = pcap_open_offline(RFileName, ebuf);

+#endif
+

                if (pd == NULL)
                        error("%s", ebuf);
                if (pd == NULL)
                        error("%s", ebuf);

+#ifdef HAVE_CAPSICUM
+               cap_rights_init(&rights, CAP_READ);
+               if (cap_rights_limit(fileno(pcap_file(pd)), &rights) < 0 &&
+                   errno != ENOSYS) {
+                       error("unable to limit pcap descriptor");
+               }
+#endif

                dlt = pcap_datalink(pd);
                dlt_name = pcap_datalink_val_to_name(dlt);
                if (dlt_name == NULL) {
                dlt = pcap_datalink(pd);
                dlt_name = pcap_datalink_val_to_name(dlt);
                if (dlt_name == NULL) {


@@ -1227,8 +1455,6 @@ main(int argc, char **argv)
                            RFileName, dlt_name,
                            pcap_datalink_val_to_description(dlt));
                }
                            RFileName, dlt_name,
                            pcap_datalink_val_to_description(dlt));
                }

-               localnet = 0;
-               netmask = 0;

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


@@ -1252,7 +1478,7 @@ main(int argc, char **argv)
                        fprintf(stderr, "%s: listening on %s\n", program_name, device);
                }
 
                        fprintf(stderr, "%s: listening on %s\n", program_name, device);
                }
 

-               fflush(stderr); 
+               fflush(stderr);

 #endif /* WIN32 */
 #ifdef HAVE_PCAP_CREATE
                pd = pcap_create(device, ebuf);
 #endif /* WIN32 */
 #ifdef HAVE_PCAP_CREATE
                pd = pcap_create(device, ebuf);


@@ -1262,6 +1488,15 @@ main(int argc, char **argv)
                if (Jflag)
                        show_tstamp_types_and_exit(device, pd);
 #endif
                if (Jflag)
                        show_tstamp_types_and_exit(device, pd);
 #endif

+#ifdef HAVE_PCAP_SET_TSTAMP_PRECISION
+               status = pcap_set_tstamp_precision(pd, gndo->ndo_tstamp_precision);
+               if (status != 0)
+                       error("%s: Can't set %ssecond time stamp precision: %s",
+                               device,
+                               tstamp_precision_to_string(gndo->ndo_tstamp_precision),
+                               pcap_statustostr(status));
+#endif
+

                /*
                 * Is this an interface that supports monitor mode?
                 */
                /*
                 * Is this an interface that supports monitor mode?
                 */


@@ -1334,13 +1569,13 @@ main(int argc, char **argv)
                                    pcap_statustostr(status));
                }
 #ifdef HAVE_PCAP_SETDIRECTION
                                    pcap_statustostr(status));
                }
 #ifdef HAVE_PCAP_SETDIRECTION

-               if (Pflag != -1) {
-                       status = pcap_setdirection(pd, Pflag);
+               if (Qflag != -1) {
+                       status = pcap_setdirection(pd, Qflag);

                        if (status != 0)
                                error("%s: pcap_setdirection() failed: %s",
                                      device,  pcap_geterr(pd));
                }
                        if (status != 0)
                                error("%s: pcap_setdirection() failed: %s",
                                      device,  pcap_geterr(pd));
                }

-#endif
+#endif /* HAVE_PCAP_SETDIRECTION */

 #else
                *ebuf = '\0';
                pd = pcap_open_live(device, snaplen, !pflag, 1000, ebuf);
 #else
                *ebuf = '\0';
                pd = pcap_open_live(device, snaplen, !pflag, 1000, ebuf);


@@ -1388,11 +1623,12 @@ main(int argc, char **argv)
                        warning("snaplen raised from %d to %d", snaplen, i);
                        snaplen = i;
                }
                        warning("snaplen raised from %d to %d", snaplen, i);
                        snaplen = i;
                }

-               if (pcap_lookupnet(device, &localnet, &netmask, ebuf) < 0) {
-                       localnet = 0;
-                       netmask = 0;
-                       warning("%s", ebuf);
-               }
+                if(fflag != 0) {
+                        if (pcap_lookupnet(device, &localnet, &netmask, ebuf) < 0) {
+                                warning("foreign (-f) flag used but: %s", ebuf);
+                        }
+                }
+

        }
        if (infile)
                cmdbuf = read_infile(infile);
        }
        if (infile)
                cmdbuf = read_infile(infile);


@@ -1407,10 +1643,10 @@ main(int argc, char **argv)
                free(cmdbuf);
                exit(0);
        }
                free(cmdbuf);
                exit(0);
        }

-       init_addrtoname(localnet, netmask);
+       init_addrtoname(gndo, localnet, netmask);

         init_checksum();
 
         init_checksum();
 

-#ifndef WIN32  
+#ifndef WIN32

        (void)setsignal(SIGPIPE, cleanup);
        (void)setsignal(SIGTERM, cleanup);
        (void)setsignal(SIGINT, cleanup);
        (void)setsignal(SIGPIPE, cleanup);
        (void)setsignal(SIGTERM, cleanup);
        (void)setsignal(SIGINT, cleanup);


@@ -1419,7 +1655,7 @@ main(int argc, char **argv)
        (void)setsignal(SIGCHLD, child_cleanup);
 #endif
        /* Cooperate with nohup(1) */
        (void)setsignal(SIGCHLD, child_cleanup);
 #endif
        /* Cooperate with nohup(1) */

-#ifndef WIN32  
+#ifndef WIN32

        if ((oldhandler = setsignal(SIGHUP, cleanup)) != SIG_DFL)
                (void)setsignal(SIGHUP, oldhandler);
 #endif /* WIN32 */
        if ((oldhandler = setsignal(SIGHUP, cleanup)) != SIG_DFL)
                (void)setsignal(SIGHUP, oldhandler);
 #endif /* WIN32 */


@@ -1472,6 +1708,21 @@ main(int argc, char **argv)
 
        if (pcap_setfilter(pd, &fcode) < 0)
                error("%s", pcap_geterr(pd));
 
        if (pcap_setfilter(pd, &fcode) < 0)
                error("%s", pcap_geterr(pd));

+#ifdef HAVE_CAPSICUM
+       if (RFileName == NULL && VFileName == NULL) {
+               static const unsigned long cmds[] = { BIOCGSTATS };
+
+               cap_rights_init(&rights, CAP_IOCTL, CAP_READ);
+               if (cap_rights_limit(pcap_fileno(pd), &rights) < 0 &&
+                   errno != ENOSYS) {
+                       error("unable to limit pcap descriptor");
+               }
+               if (cap_ioctls_limit(pcap_fileno(pd), cmds,
+                   sizeof(cmds) / sizeof(cmds[0])) < 0 && errno != ENOSYS) {
+                       error("unable to limit ioctls on pcap descriptor");
+               }
+       }
+#endif

        if (WFileName) {
                pcap_dumper_t *p;
                /* Do not exceed the default PATH_MAX for files. */
        if (WFileName) {
                pcap_dumper_t *p;
                /* Do not exceed the default PATH_MAX for files. */


@@ -1493,9 +1744,32 @@ main(int argc, char **argv)
 #endif
                if (p == NULL)
                        error("%s", pcap_geterr(pd));
 #endif
                if (p == NULL)
                        error("%s", pcap_geterr(pd));

+#ifdef HAVE_CAPSICUM
+               cap_rights_init(&rights, CAP_SEEK, CAP_WRITE);
+               if (cap_rights_limit(fileno(pcap_dump_file(p)), &rights) < 0 &&
+                   errno != ENOSYS) {
+                       error("unable to limit dump descriptor");
+               }
+#endif

                if (Cflag != 0 || Gflag != 0) {
                if (Cflag != 0 || Gflag != 0) {

-                       callback = dump_packet_and_trunc;
+#ifdef HAVE_CAPSICUM
+                       dumpinfo.WFileName = strdup(basename(WFileName));
+                       dumpinfo.dirfd = open(dirname(WFileName),
+                           O_DIRECTORY | O_RDONLY);
+                       if (dumpinfo.dirfd < 0) {
+                               error("unable to open directory %s",
+                                   dirname(WFileName));
+                       }
+                       cap_rights_init(&rights, CAP_CREATE, CAP_FCNTL,
+                           CAP_FTRUNCATE, CAP_LOOKUP, CAP_SEEK, CAP_WRITE);
+                       if (cap_rights_limit(dumpinfo.dirfd, &rights) < 0 &&
+                           errno != ENOSYS) {
+                               error("unable to limit directory rights");
+                       }
+#else  /* !HAVE_CAPSICUM */

                        dumpinfo.WFileName = WFileName;
                        dumpinfo.WFileName = WFileName;

+#endif
+                       callback = dump_packet_and_trunc;

                        dumpinfo.pd = pd;
                        dumpinfo.p = p;
                        pcap_userdata = (u_char *)&dumpinfo;
                        dumpinfo.pd = pd;
                        dumpinfo.p = p;
                        pcap_userdata = (u_char *)&dumpinfo;


@@ -1565,6 +1839,15 @@ main(int argc, char **argv)
                (void)fflush(stderr);
        }
 #endif /* WIN32 */
                (void)fflush(stderr);
        }
 #endif /* WIN32 */

+
+#ifdef HAVE_CAPSICUM
+       cansandbox = (nflag && VFileName == NULL && zflag == NULL);
+       if (cansandbox && cap_enter() < 0 && errno != ENOSYS)
+               error("unable to enter the capability mode");
+       if (cap_sandboxed())
+               fprintf(stderr, "capability mode sandbox enabled\n");
+#endif /* HAVE_CAPSICUM */
+

        do {
                status = pcap_loop(pd, cnt, callback, pcap_userdata);
                if (WFileName == NULL) {
        do {
                status = pcap_loop(pd, cnt, callback, pcap_userdata);
                if (WFileName == NULL) {


@@ -1612,6 +1895,13 @@ main(int argc, char **argv)
                                pd = pcap_open_offline(RFileName, ebuf);
                                if (pd == NULL)
                                        error("%s", ebuf);
                                pd = pcap_open_offline(RFileName, ebuf);
                                if (pd == NULL)
                                        error("%s", ebuf);

+#ifdef HAVE_CAPSICUM
+                               cap_rights_init(&rights, CAP_READ);
+                               if (cap_rights_limit(fileno(pcap_file(pd)),
+                                   &rights) < 0 && errno != ENOSYS) {
+                                       error("unable to limit pcap descriptor");
+                               }
+#endif

                                new_dlt = pcap_datalink(pd);
                                if (WFileName && new_dlt != dlt)
                                        error("%s: new dlt does not match original", RFileName);
                                new_dlt = pcap_datalink(pd);
                                if (WFileName && new_dlt != dlt)
                                        error("%s: new dlt does not match original", RFileName);


@@ -1780,6 +2070,9 @@ static void
 dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 {
        struct dump_info *dump_info;
 dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 {
        struct dump_info *dump_info;

+#ifdef HAVE_CAPSICUM
+       cap_rights_t rights;
+#endif

 
        ++packets_captured;
 
 
        ++packets_captured;
 


@@ -1808,6 +2101,11 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
 
                /* If the time is greater than the specified window, rotate */
                if (t - Gflag_time >= Gflag) {
 
                /* If the time is greater than the specified window, rotate */
                if (t - Gflag_time >= Gflag) {

+#ifdef HAVE_CAPSICUM
+                       FILE *fp;
+                       int fd;
+#endif
+

                        /* Update the Gflag_time */
                        Gflag_time = t;
                        /* Update Gflag_count */
                        /* Update the Gflag_time */
                        Gflag_time = t;
                        /* Update Gflag_count */


@@ -1839,6 +2137,13 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
                        dump_info->CurrentFileName = (char *)malloc(PATH_MAX + 1);
                        if (dump_info->CurrentFileName == NULL)
                                error("dump_packet_and_trunc: malloc");
                        dump_info->CurrentFileName = (char *)malloc(PATH_MAX + 1);
                        if (dump_info->CurrentFileName == NULL)
                                error("dump_packet_and_trunc: malloc");

+                       /*
+                        * Gflag was set otherwise we wouldn't be here. Reset the count
+                        * so multiple files would end with 1,2,3 in the filename.
+                        * The counting is handled with the -C flow after this.
+                        */
+                       Cflag_count = 0;
+

                        /*
                         * This is always the first file in the Cflag
                         * rotation: e.g. 0
                        /*
                         * This is always the first file in the Cflag
                         * rotation: e.g. 0


@@ -1854,13 +2159,36 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
                        capng_update(CAPNG_ADD, CAPNG_EFFECTIVE, CAP_DAC_OVERRIDE);
                        capng_apply(CAPNG_EFFECTIVE);
 #endif /* HAVE_CAP_NG_H */
                        capng_update(CAPNG_ADD, CAPNG_EFFECTIVE, CAP_DAC_OVERRIDE);
                        capng_apply(CAPNG_EFFECTIVE);
 #endif /* HAVE_CAP_NG_H */

+#ifdef HAVE_CAPSICUM
+                       fd = openat(dump_info->dirfd,
+                           dump_info->CurrentFileName,
+                           O_CREAT | O_WRONLY | O_TRUNC, 0644);
+                       if (fd < 0) {
+                               error("unable to open file %s",
+                                   dump_info->CurrentFileName);
+                       }
+                       fp = fdopen(fd, "w");
+                       if (fp == NULL) {
+                               error("unable to fdopen file %s",
+                                   dump_info->CurrentFileName);
+                       }
+                       dump_info->p = pcap_dump_fopen(dump_info->pd, fp);
+#else  /* !HAVE_CAPSICUM */

                        dump_info->p = pcap_dump_open(dump_info->pd, dump_info->CurrentFileName);
                        dump_info->p = pcap_dump_open(dump_info->pd, dump_info->CurrentFileName);

+#endif

 #ifdef HAVE_CAP_NG_H
                        capng_update(CAPNG_DROP, CAPNG_EFFECTIVE, CAP_DAC_OVERRIDE);
                        capng_apply(CAPNG_EFFECTIVE);
 #endif /* HAVE_CAP_NG_H */
                        if (dump_info->p == NULL)
                                error("%s", pcap_geterr(pd));
 #ifdef HAVE_CAP_NG_H
                        capng_update(CAPNG_DROP, CAPNG_EFFECTIVE, CAP_DAC_OVERRIDE);
                        capng_apply(CAPNG_EFFECTIVE);
 #endif /* HAVE_CAP_NG_H */
                        if (dump_info->p == NULL)
                                error("%s", pcap_geterr(pd));

+#ifdef HAVE_CAPSICUM
+                       cap_rights_init(&rights, CAP_SEEK, CAP_WRITE);
+                       if (cap_rights_limit(fileno(pcap_dump_file(dump_info->p)),
+                           &rights) < 0 && errno != ENOSYS) {
+                               error("unable to limit dump descriptor");
+                       }
+#endif

                }
        }
 
                }
        }
 


@@ -1870,6 +2198,11 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
         * file could put it over Cflag.
         */
        if (Cflag != 0 && pcap_dump_ftell(dump_info->p) > Cflag) {
         * file could put it over Cflag.
         */
        if (Cflag != 0 && pcap_dump_ftell(dump_info->p) > Cflag) {

+#ifdef HAVE_CAPSICUM
+               FILE *fp;
+               int fd;
+#endif
+

                /*
                 * Close the current file and open a new one.
                 */
                /*
                 * Close the current file and open a new one.
                 */


@@ -1892,9 +2225,31 @@ dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *s
                if (dump_info->CurrentFileName == NULL)
                        error("dump_packet_and_trunc: malloc");
                MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, Cflag_count, WflagChars);
                if (dump_info->CurrentFileName == NULL)
                        error("dump_packet_and_trunc: malloc");
                MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, Cflag_count, WflagChars);

+#ifdef HAVE_CAPSICUM
+               fd = openat(dump_info->dirfd, dump_info->CurrentFileName,
+                   O_CREAT | O_WRONLY | O_TRUNC, 0644);
+               if (fd < 0) {
+                       error("unable to open file %s",
+                           dump_info->CurrentFileName);
+               }
+               fp = fdopen(fd, "w");
+               if (fp == NULL) {
+                       error("unable to fdopen file %s",
+                           dump_info->CurrentFileName);
+               }
+               dump_info->p = pcap_dump_fopen(dump_info->pd, fp);
+#else  /* !HAVE_CAPSICUM */

                dump_info->p = pcap_dump_open(dump_info->pd, dump_info->CurrentFileName);
                dump_info->p = pcap_dump_open(dump_info->pd, dump_info->CurrentFileName);

+#endif

                if (dump_info->p == NULL)
                        error("%s", pcap_geterr(pd));
                if (dump_info->p == NULL)
                        error("%s", pcap_geterr(pd));

+#ifdef HAVE_CAPSICUM
+               cap_rights_init(&rights, CAP_SEEK, CAP_WRITE);
+               if (cap_rights_limit(fileno(pcap_dump_file(dump_info->p)),
+                   &rights) < 0 && errno != ENOSYS) {
+                       error("unable to limit dump descriptor");
+               }
+#endif

        }
 
        pcap_dump((u_char *)dump_info->p, h, sp);
        }
 
        pcap_dump((u_char *)dump_info->p, h, sp);


@@ -1931,36 +2286,42 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 {
        struct print_info *print_info;
        u_int hdrlen;
 {
        struct print_info *print_info;
        u_int hdrlen;

+        netdissect_options *ndo;

 
        ++packets_captured;
 
        ++infodelay;
 
        ++packets_captured;
 
        ++infodelay;

-       ts_print(&h->ts);

 
        print_info = (struct print_info *)user;
 
        print_info = (struct print_info *)user;

+        ndo = print_info->ndo;
+
+       if(ndo->ndo_packet_number)
+               ND_PRINT((ndo, "%5u  ", packets_captured));
+
+       ts_print(ndo, &h->ts);

 
        /*
         * Some printers want to check that they're not walking off the
         * end of the packet.
         * Rather than pass it all the way down, we set this global.
         */
 
        /*
         * Some printers want to check that they're not walking off the
         * end of the packet.
         * Rather than pass it all the way down, we set this global.
         */

-       snapend = sp + h->caplen;
+       ndo->ndo_snapend = sp + h->caplen;

 
         if(print_info->ndo_type) {
                 hdrlen = (*print_info->p.ndo_printer)(print_info->ndo, h, sp);
         } else {
                 hdrlen = (*print_info->p.printer)(h, sp);
         }
 
         if(print_info->ndo_type) {
                 hdrlen = (*print_info->p.ndo_printer)(print_info->ndo, h, sp);
         } else {
                 hdrlen = (*print_info->p.printer)(h, sp);
         }

-                
-       if (Xflag) {
+
+       if (ndo->ndo_Xflag) {

                /*
                 * Print the raw packet data in hex and ASCII.
                 */
                /*
                 * Print the raw packet data in hex and ASCII.
                 */

-               if (Xflag > 1) {
+               if (ndo->ndo_Xflag > 1) {

                        /*
                         * Include the link-layer header.
                         */
                        /*
                         * Include the link-layer header.
                         */

-                       hex_and_ascii_print("\n\t", sp, h->caplen);
+                       hex_and_ascii_print(ndo, "\n\t", sp, h->caplen);

                } else {
                        /*
                         * Don't include the link-layer header - and if
                } else {
                        /*
                         * Don't include the link-layer header - and if


@@ -1968,18 +2329,18 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
                         * print nothing.
                         */
                        if (h->caplen > hdrlen)
                         * print nothing.
                         */
                        if (h->caplen > hdrlen)

-                               hex_and_ascii_print("\n\t", sp + hdrlen,
+                               hex_and_ascii_print(ndo, "\n\t", sp + hdrlen,

                                    h->caplen - hdrlen);
                }
                                    h->caplen - hdrlen);
                }

-       } else if (xflag) {
+       } else if (ndo->ndo_xflag) {

                /*
                 * Print the raw packet data in hex.
                 */
                /*
                 * Print the raw packet data in hex.
                 */

-               if (xflag > 1) {
+               if (ndo->ndo_xflag > 1) {

                        /*
                         * Include the link-layer header.
                         */
                        /*
                         * Include the link-layer header.
                         */

-                       hex_print("\n\t", sp, h->caplen);
+                        hex_print(ndo, "\n\t", sp, h->caplen);

                } else {
                        /*
                         * Don't include the link-layer header - and if
                } else {
                        /*
                         * Don't include the link-layer header - and if


@@ -1987,18 +2348,18 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
                         * print nothing.
                         */
                        if (h->caplen > hdrlen)
                         * print nothing.
                         */
                        if (h->caplen > hdrlen)

-                               hex_print("\n\t", sp + hdrlen,
-                                   h->caplen - hdrlen);
+                               hex_print(ndo, "\n\t", sp + hdrlen,
+                                          h->caplen - hdrlen);

                }
                }

-       } else if (Aflag) {
+       } else if (ndo->ndo_Aflag) {

                /*
                 * Print the raw packet data in ASCII.
                 */
                /*
                 * Print the raw packet data in ASCII.
                 */

-               if (Aflag > 1) {
+               if (ndo->ndo_Aflag > 1) {

                        /*
                         * Include the link-layer header.
                         */
                        /*
                         * Include the link-layer header.
                         */

-                       ascii_print(sp, h->caplen);
+                       ascii_print(ndo, sp, h->caplen);

                } else {
                        /*
                         * Don't include the link-layer header - and if
                } else {
                        /*
                         * Don't include the link-layer header - and if


@@ -2006,7 +2367,7 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
                         * print nothing.
                         */
                        if (h->caplen > hdrlen)
                         * print nothing.
                         */
                        if (h->caplen > hdrlen)

-                               ascii_print(sp + hdrlen, h->caplen - hdrlen);
+                               ascii_print(ndo, sp + hdrlen, h->caplen - hdrlen);

                }
        }
 
                }
        }
 


@@ -2036,11 +2397,11 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
         * version number of the Packet.dll code, to supply the
         * "Wpcap_version" information on Windows.
         */
         * version number of the Packet.dll code, to supply the
         * "Wpcap_version" information on Windows.
         */

-       char WDversion[]="current-cvs.tcpdump.org";
+       char WDversion[]="current-git.tcpdump.org";

 #if !defined(HAVE_GENERATED_VERSION)
 #if !defined(HAVE_GENERATED_VERSION)

-       char version[]="current-cvs.tcpdump.org";
+       char version[]="current-git.tcpdump.org";

 #endif
 #endif

-       char pcap_version[]="current-cvs.tcpdump.org";
+       char pcap_version[]="current-git.tcpdump.org";

        char Wpcap_version[]="3.1";
 #endif
 
        char Wpcap_version[]="3.1";
 #endif
 


@@ -2048,9 +2409,9 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
  * By default, print the specified data out in hex and ASCII.
  */
 static void
  * By default, print the specified data out in hex and ASCII.
  */
 static void

-ndo_default_print(netdissect_options *ndo _U_, const u_char *bp, u_int length)
+ndo_default_print(netdissect_options *ndo, const u_char *bp, u_int length)

 {
 {

-       hex_and_ascii_print("\n\t", bp, length); /* pass on lf and identation string */
+       hex_and_ascii_print(ndo, "\n\t", bp, length); /* pass on lf and identation string */

 }
 
 void
 }
 
 void


@@ -2092,8 +2453,9 @@ static void verbose_stats_dump(int sig _U_)
 }
 #endif
 
 }
 #endif
 

+USES_APPLE_DEPRECATED_API

 static void
 static void

-usage(void)
+print_version(void)

 {
        extern char version[];
 #ifndef HAVE_PCAP_LIB_VERSION
 {
        extern char version[];
 #ifndef HAVE_PCAP_LIB_VERSION


@@ -2120,23 +2482,43 @@ usage(void)
        (void)fprintf(stderr, "libpcap version %s\n", pcap_version);
 #endif /* WIN32 */
 #endif /* HAVE_PCAP_LIB_VERSION */
        (void)fprintf(stderr, "libpcap version %s\n", pcap_version);
 #endif /* WIN32 */
 #endif /* HAVE_PCAP_LIB_VERSION */

+
+#if defined(HAVE_LIBCRYPTO) && defined(SSLEAY_VERSION)
+       (void)fprintf (stderr, "%s\n", SSLeay_version(SSLEAY_VERSION));
+#endif
+
+#if defined(HAVE_SMI_H)
+       (void)fprintf (stderr, "SMI-library: %s\n", smi_version_string);
+#endif
+}
+USES_APPLE_RST
+
+static void
+print_usage(void)
+{
+       print_version();

        (void)fprintf(stderr,
        (void)fprintf(stderr,

-"Usage: %s [-aAbd" D_FLAG "efhH" I_FLAG J_FLAG "KlLnNOpqRStu" U_FLAG "vxX]" B_FLAG_USAGE " [ -c count ]\n", program_name);
+"Usage: %s [-aAbd" D_FLAG "efhH" I_FLAG J_FLAG "KlLnNOpqRStu" U_FLAG "vxX#]" B_FLAG_USAGE " [ -c count ]\n", program_name);

        (void)fprintf(stderr,
 "\t\t[ -C file_size ] [ -E algo:secret ] [ -F file ] [ -G seconds ]\n");
        (void)fprintf(stderr,
        (void)fprintf(stderr,
 "\t\t[ -C file_size ] [ -E algo:secret ] [ -F file ] [ -G seconds ]\n");
        (void)fprintf(stderr,

-"\t\t[ -i interface ]" j_FLAG_USAGE " [ -M secret ]\n");
+"\t\t[ -i interface ]" j_FLAG_USAGE " [ -M secret ] [ --number ]\n");

 #ifdef HAVE_PCAP_SETDIRECTION
        (void)fprintf(stderr,
 #ifdef HAVE_PCAP_SETDIRECTION
        (void)fprintf(stderr,

-"\t\t[ -P in|out|inout ]\n");
+"\t\t[ -Q in|out|inout ]\n");

 #endif
        (void)fprintf(stderr,
 #endif
        (void)fprintf(stderr,

-"\t\t[ -r file ] [ -s snaplen ] [ -T type ] [ -V file ] [ -w file ]\n");
+"\t\t[ -r file ] [ -s snaplen ] ");
+#ifdef HAVE_PCAP_SET_TSTAMP_PRECISION
+       (void)fprintf(stderr, "[ --time-stamp-precision precision ]\n");

        (void)fprintf(stderr,
        (void)fprintf(stderr,

-"\t\t[ -W filecount ] [ -y datalinktype ] [ -z command ]\n");
+"\t\t");
+#endif
+       (void)fprintf(stderr, "[ -T type ] [ --version ] [ -V file ]\n");
+       (void)fprintf(stderr,
+"\t\t[ -w file ] [ -W filecount ] [ -y datalinktype ] [ -z command ]\n");

        (void)fprintf(stderr,
 "\t\t[ -Z user ] [ expression ]\n");
        (void)fprintf(stderr,
 "\t\t[ -Z user ] [ expression ]\n");

-       exit(1);

 }
 
 
 }
 
 


@@ -2176,3 +2558,9 @@ ndo_warning(netdissect_options *ndo _U_, const char *fmt, ...)
                        (void)fputc('\n', stderr);
        }
 }
                        (void)fputc('\n', stderr);
        }
 }

+/*
+ * Local Variables:
+ * c-style: whitesmith
+ * c-basic-offset: 8
+ * End:
+ */