Handle rpcaps:// URLs as well, for rpcap-over-TLS.

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index 62af381c524b7c011fe1d75b2885dfcf4a2ea2c7..1ed33461cd2710735680a064a5e3107905337861 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -81,7 +81,7 @@ The Regents of the University of California.  All rights reserved.\n";
  * in the opposite order works fine.
  */
 #ifdef HAVE_CAPSICUM
  * in the opposite order works fine.
  */
 #ifdef HAVE_CAPSICUM

-#include <sys/capability.h>
+#include <sys/capsicum.h>

 #include <sys/ioccom.h>
 #include <net/bpf.h>
 #include <libgen.h>
 #include <sys/ioccom.h>
 #include <net/bpf.h>
 #include <libgen.h>


@@ -624,6 +624,10 @@ show_remote_devices_and_exit(void)
 #define J_FLAG
 #endif /* PCAP_ERROR_TSTAMP_TYPE_NOTSUP */
 
 #define J_FLAG
 #endif /* PCAP_ERROR_TSTAMP_TYPE_NOTSUP */
 

+#ifdef USE_LIBSMI
+#define m_FLAG_USAGE "[ -m module ] ..."
+#endif
+

 #ifdef HAVE_PCAP_SETDIRECTION
 #define Q_FLAG "Q:"
 #define Q_FLAG_USAGE " [ -Q in|out|inout ]"
 #ifdef HAVE_PCAP_SETDIRECTION
 #define Q_FLAG "Q:"
 #define Q_FLAG_USAGE " [ -Q in|out|inout ]"


@@ -713,7 +717,7 @@ static const struct option longopts[] = {
 };
 
 #ifdef HAVE_PCAP_FINDALLDEVS_EX
 };
 
 #ifdef HAVE_PCAP_FINDALLDEVS_EX

-#define LIST_REMOTE_INTERFACES_USAGE "[ --list-remote-interfaces remote-source  ]"
+#define LIST_REMOTE_INTERFACES_USAGE "[ --list-remote-interfaces remote-source ]"

 #else
 #define LIST_REMOTE_INTERFACES_USAGE
 #endif
 #else
 #define LIST_REMOTE_INTERFACES_USAGE
 #endif


@@ -1156,6 +1160,9 @@ _U_
                 */
                endp++; /* Include the trailing / in the URL; pcap_findalldevs_ex() requires it */
                host_url = malloc(endp - url + 1);
                 */
                endp++; /* Include the trailing / in the URL; pcap_findalldevs_ex() requires it */
                host_url = malloc(endp - url + 1);

+               if (host_url == NULL && (endp - url + 1) > 0)
+                       error("Invalid allocation for host");
+

                memcpy(host_url, url, endp - url);
                host_url[endp - url] = '\0';
                status = pcap_findalldevs_ex(host_url, NULL, &devlist, ebuf);
                memcpy(host_url, url, endp - url);
                host_url[endp - url] = '\0';
                status = pcap_findalldevs_ex(host_url, NULL, &devlist, ebuf);


@@ -1181,9 +1188,10 @@ _U_
 
 #ifdef HAVE_PCAP_OPEN
 /*
 
 #ifdef HAVE_PCAP_OPEN
 /*

- * Prefix for rpcap URLs.
+ * Prefixes for rpcap URLs.

  */
 static char rpcap_prefix[] = "rpcap://";
  */
 static char rpcap_prefix[] = "rpcap://";

+static char rpcap_ssl_prefix[] = "rpcaps://";

 #endif
 
 static pcap_t *
 #endif
 
 static pcap_t *


@@ -1199,7 +1207,8 @@ open_interface(const char *device, netdissect_options *ndo, char *ebuf)
        /*
         * Is this an rpcap URL?
         */
        /*
         * Is this an rpcap URL?
         */

-       if (strncmp(device, rpcap_prefix, sizeof(rpcap_prefix) - 1) == 0) {
+       if (strncmp(device, rpcap_prefix, sizeof(rpcap_prefix) - 1) == 0 ||
+           strncmp(device, rpcap_ssl_prefix, sizeof(rpcap_ssl_prefix) - 1) == 0) {

                /*
                 * Yes.  Open it with pcap_open().
                 */
                /*
                 * Yes.  Open it with pcap_open().
                 */


@@ -1974,15 +1983,14 @@ main(int argc, char **argv)
 #endif
                dlt = pcap_datalink(pd);
                dlt_name = pcap_datalink_val_to_name(dlt);
 #endif
                dlt = pcap_datalink(pd);
                dlt_name = pcap_datalink_val_to_name(dlt);

+               fprintf(stderr, "reading from file %s", RFileName);

                if (dlt_name == NULL) {
                if (dlt_name == NULL) {

-                       fprintf(stderr, "reading from file %s, link-type %u\n",
-                           RFileName, dlt);
+                       fprintf(stderr, ", link-type %u", dlt);

                } else {
                } else {

-                       fprintf(stderr,
-                           "reading from file %s, link-type %s (%s)\n",
-                           RFileName, dlt_name,
-                           pcap_datalink_val_to_description(dlt));
+                       fprintf(stderr, ", link-type %s (%s)", dlt_name,
+                               pcap_datalink_val_to_description(dlt));

                }
                }

+               fprintf(stderr, ", snapshot length %d\n", pcap_snapshot(pd));

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


@@ -2262,7 +2270,7 @@ DIAG_ON_CLANG(assign-enum)
                if (pdd == NULL)
                        error("%s", pcap_geterr(pd));
 #ifdef HAVE_CAPSICUM
                if (pdd == NULL)
                        error("%s", pcap_geterr(pd));
 #ifdef HAVE_CAPSICUM

-               set_dumper_capsicum_rights(p);
+               set_dumper_capsicum_rights(pdd);

 #endif
                if (Cflag != 0 || Gflag != 0) {
 #ifdef HAVE_CAPSICUM
 #endif
                if (Cflag != 0 || Gflag != 0) {
 #ifdef HAVE_CAPSICUM


@@ -2379,14 +2387,14 @@ DIAG_ON_CLANG(assign-enum)
                        (void)fprintf(stderr, "%s: ", program_name);
                dlt = pcap_datalink(pd);
                dlt_name = pcap_datalink_val_to_name(dlt);
                        (void)fprintf(stderr, "%s: ", program_name);
                dlt = pcap_datalink(pd);
                dlt_name = pcap_datalink_val_to_name(dlt);

+               (void)fprintf(stderr, "listening on %s", device);

                if (dlt_name == NULL) {
                if (dlt_name == NULL) {

-                       (void)fprintf(stderr, "listening on %s, link-type %u, capture size %d bytes\n",
-                           device, dlt, ndo->ndo_snaplen);
+                       (void)fprintf(stderr, ", link-type %u", dlt);

                } else {
                } else {

-                       (void)fprintf(stderr, "listening on %s, link-type %s (%s), capture size %d bytes\n",
-                           device, dlt_name,
-                           pcap_datalink_val_to_description(dlt), ndo->ndo_snaplen);
+                       (void)fprintf(stderr, ", link-type %s (%s)", dlt_name,
+                                     pcap_datalink_val_to_description(dlt));

                }
                }

+               (void)fprintf(stderr, ", snapshot length %d bytes\n", ndo->ndo_snaplen);

                (void)fflush(stderr);
        }
 
                (void)fflush(stderr);
        }
 


@@ -2502,15 +2510,15 @@ DIAG_ON_CLANG(assign-enum)
                                 * Report the new file.
                                 */
                                dlt_name = pcap_datalink_val_to_name(dlt);
                                 * Report the new file.
                                 */
                                dlt_name = pcap_datalink_val_to_name(dlt);

+                               fprintf(stderr, "reading from file %s", RFileName);

                                if (dlt_name == NULL) {
                                if (dlt_name == NULL) {

-                                       fprintf(stderr, "reading from file %s, link-type %u\n",
-                                           RFileName, dlt);
+                                       fprintf(stderr, ", link-type %u", dlt);

                                } else {
                                } else {

-                                       fprintf(stderr,
-                                       "reading from file %s, link-type %s (%s)\n",
-                                           RFileName, dlt_name,
-                                           pcap_datalink_val_to_description(dlt));
+                                       fprintf(stderr, ", link-type %s (%s)",
+                                               dlt_name,
+                                               pcap_datalink_val_to_description(dlt));

                                }
                                }

+                               fprintf(stderr, ", snapshot length %d\n", pcap_snapshot(pd));

                        }
                }
        }
                        }
                }
        }


@@ -3057,6 +3065,10 @@ print_usage(void)
 #ifdef HAVE_PCAP_FINDALLDEVS_EX
        (void)fprintf(stderr,
 "\t\t" LIST_REMOTE_INTERFACES_USAGE "\n");
 #ifdef HAVE_PCAP_FINDALLDEVS_EX
        (void)fprintf(stderr,
 "\t\t" LIST_REMOTE_INTERFACES_USAGE "\n");

+#endif
+#ifdef USE_LIBSMI
+       (void)fprintf(stderr,
+"\t\t" m_FLAG_USAGE "\n");

 #endif
        (void)fprintf(stderr,
 "\t\t[ -M secret ] [ --number ] [ --print ]" Q_FLAG_USAGE "\n");
 #endif
        (void)fprintf(stderr,
 "\t\t[ -M secret ] [ --number ] [ --print ]" Q_FLAG_USAGE "\n");