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 cd022ad8dc99198f14fedf2c66b4ff6daac53739..11dc8bc8b854f356ccbe805ef0308357afbd637f 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -57,6 +57,10 @@ 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
 #ifdef HAVE_GETOPT_LONG
 #include <getopt.h>
 #else


@@ -68,12 +72,18 @@ extern int SIZE_BUF;
 #include <stdlib.h>
 #include <string.h>
 #include <limits.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 */


@@ -123,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 *);


@@ -437,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


@@ -551,6 +565,27 @@ show_devices_and_exit (void)
 }
 #endif /* HAVE_PCAP_FINDALLDEVS */
 
 }
 #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.


@@ -603,67 +638,65 @@ show_devices_and_exit (void)
 #define Q_FLAG
 #endif
 
 #define Q_FLAG
 #endif
 

-static struct option longopts[] = {
-       { NULL, no_argument, NULL, 'a' },
-       { NULL, no_argument, NULL, 'A' },
-       { NULL, no_argument, NULL, 'b' },
+/*
+ * 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)
 #if defined(HAVE_PCAP_CREATE) || defined(WIN32)

-       { NULL, required_argument, NULL, 'B' },
-#endif
-       { NULL, required_argument, NULL, 'c' },
-       { NULL, required_argument, NULL, 'C' },
-       { NULL, no_argument, NULL, 'd' },
-       { NULL, no_argument, NULL, 'D' },
-       { NULL, no_argument, NULL, 'L' },
-       { NULL, no_argument, NULL, 'e' },
-       { NULL, required_argument, NULL, 'E' },
-       { NULL, no_argument, NULL, 'f' },
-       { NULL, required_argument, NULL, 'F' },
-       { NULL, required_argument, NULL, 'G' },
-       { NULL, no_argument, NULL, 'h' },
-       { NULL, no_argument, NULL, 'H' },
-       { NULL, required_argument, NULL, 'i' },
+       { "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
 #ifdef HAVE_PCAP_CREATE

-       { NULL, no_argument, NULL, 'I' },
+       { "monitor-mode", no_argument, NULL, 'I' },

 #endif
 #ifdef HAVE_PCAP_SET_TSTAMP_TYPE
 #endif
 #ifdef HAVE_PCAP_SET_TSTAMP_TYPE

-       { NULL, required_argument, NULL, 'j' },
-       { NULL, no_argument, NULL, 'J' },
-#endif
-       { NULL, no_argument, NULL, 'l' },
-       { NULL, no_argument, NULL, 'K' },
-       { NULL, required_argument, NULL, 'm' },
-       { NULL, required_argument, NULL, 'M' },
-       { NULL, no_argument, NULL, 'n' },
-       { NULL, no_argument, NULL, 'N' },
-       { NULL, no_argument, NULL, 'O' },
-       { NULL, no_argument, NULL, 'p' },
-       { NULL, no_argument, NULL, 'q' },
+       { "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
 #ifdef HAVE_PCAP_SETDIRECTION

-       { NULL, required_argument, NULL, 'Q' },
-#endif
-       { NULL, required_argument, NULL, 'r' },
-       { NULL, no_argument, NULL, 'R' },
-       { NULL, required_argument, NULL, 's' },
-       { NULL, no_argument, NULL, 'S' },
-       { NULL, no_argument, NULL, 't' },
-       { NULL, required_argument, NULL, 'T' },
-       { NULL, no_argument, NULL, 'u' },
+       { "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
 #ifdef HAVE_PCAP_DUMP_FLUSH

-       { NULL, no_argument, NULL, 'U' },
-#endif
-       { NULL, no_argument, NULL, 'v' },
-       { NULL, required_argument, NULL, 'V' },
-       { NULL, required_argument, NULL, 'w' },
-       { NULL, required_argument, NULL, 'W' },
-       { NULL, no_argument, NULL, 'x' },
-       { NULL, no_argument, NULL, 'X' },
-       { NULL, required_argument, NULL, 'y' },
+       { "packet-buffered", no_argument, NULL, 'U' },
+#endif
+       { "linktype", required_argument, NULL, 'y' },

 #if defined(HAVE_PCAP_DEBUG) || defined(HAVE_YYDEBUG)
 #if defined(HAVE_PCAP_DEBUG) || defined(HAVE_YYDEBUG)

-       { NULL, no_argument, NULL, 'Y' },
+       { "debug-filter-parser", no_argument, NULL, 'Y' },

 #endif
 #endif

-       { NULL, required_argument, NULL, 'z' },
-       { NULL, required_argument, NULL, 'Z' },
+       { "relinquish-privileges", required_argument, NULL, 'Z' },
+       { "number", no_argument, NULL, '#' },
+       { "version", no_argument, NULL, OPTION_VERSION },

        { NULL, 0, NULL, 0 }
 };
 
        { NULL, 0, NULL, 0 }
 };
 


@@ -691,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);


@@ -710,6 +746,9 @@ droproot(const char *username, const char *chroot_dir)
                            pcap_strerror(errno));
                        exit(1);
                }
                            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 {


@@ -820,6 +859,36 @@ 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)
 {
 int
 main(int argc, char **argv)
 {


@@ -850,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 */


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

-           (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)
+           (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':


@@ -967,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':


@@ -1245,8 +1320,26 @@ main(int argc, char **argv)
                        username = strdup(optarg);
                        break;
 
                        username = strdup(optarg);
                        break;
 

+               case '#':
+                       gndo->ndo_packet_number = 1;
+                       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 */
                }
 


@@ -1335,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) {


@@ -1382,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?
                 */


@@ -1593,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. */


@@ -1614,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;


@@ -1686,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) {


@@ -1733,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);


@@ -1901,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;
 


@@ -1929,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 */


@@ -1982,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

                }
        }
 
                }
        }
 


@@ -1998,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.
                 */


@@ -2020,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);


@@ -2067,6 +2294,10 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
 
        print_info = (struct print_info *)user;
         ndo = print_info->ndo;
 
        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);
 
        /*
        ts_print(ndo, &h->ts);
 
        /*


@@ -2222,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


@@ -2250,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,
 "\t\t[ -Q in|out|inout ]\n");
 #endif
        (void)fprintf(stderr,
 #ifdef HAVE_PCAP_SETDIRECTION
        (void)fprintf(stderr,
 "\t\t[ -Q in|out|inout ]\n");
 #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);

 }
 
 
 }