diff options
author | Guy Harris <guy@alum.mit.edu> | 2016-01-05 13:54:02 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-01-07 04:38:39 +0000 |
commit | ba3aa03dcfb49a3bb2b090b864f1311fa4ecbc0e (patch) | |
tree | 334369b53be04c07bbd6269e316c93fc3dba6d03 /caputils/capture-pcap-util.h | |
parent | 97378a5bad8c20f4364b7fe86d96d9d14a192d48 (diff) |
Move more capture device handling to the caputils library.
Move the code to open capture devices and get properties of capture
devices there, joining the code to get a list of capture devices.
This lets us do a better job of handling pcap_create() in WinPcap,
including handling both WinPcap with pcap_create() and WinPcap without
pcap_create() at run time, just in case somebody tries using WinPcap 3.x
with a Wireshark built with WinPcap 4.x.
It also could make it easier to use libpcap/WinPcap directly in
Wireshark and TShark, if we have versions of libpcap/WinPcap that run
small helper utilities to do privileged functions, allowing programs
using them never to need elevated privileges themselves. That might
make it easier to fix some issues with running TShark when not saving to
a file (we could avoid the file entirely) and with delays when stopping
a capture in Wireshark (Wireshark could stop writing to the file as soon
as you click the stop button, rather than letting dumpcap do so when the
signal gets to it).
It might also make it easier to handle future versions of
libpcap/WinPcap that support using pcap_create()/pcap_activate() for
remote captures, and other future extensions to libpcap/WinPcap.
Rename some XXX_linktype routines to XXX_datalink to indicate that they
work with DLT_ values rather than LINKTYPE_ values; future versions of
libpcap might use LINKTYPE_ values in newer APIs.
Check for pcap_create() on all platforms in CMake.
Change-Id: Ia12e1692c96ec945c07a135d246958771a29c817
Reviewed-on: https://code.wireshark.org/review/13062
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'caputils/capture-pcap-util.h')
-rw-r--r-- | caputils/capture-pcap-util.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/caputils/capture-pcap-util.h b/caputils/capture-pcap-util.h index 3cec18305b..1eaad35e5c 100644 --- a/caputils/capture-pcap-util.h +++ b/caputils/capture-pcap-util.h @@ -31,6 +31,8 @@ extern "C" { #include <pcap.h> +#include "capture_opts.h" + /* * A snapshot length of 0 is useless - and libpcap/WinPcap don't guarantee * that a snapshot length of 0 will work, and, on some platforms, it won't @@ -50,23 +52,28 @@ GList *get_remote_interface_list(const char *hostname, const char *port, const char *linktype_val_to_name(int dlt); int linktype_name_to_val(const char *linktype); -#ifdef HAVE_PCAP_SET_TSTAMP_PRECISION -/* - * Get the versions of capture libraries with which we were compiled, - * and append them to a GString. - */ -void request_high_resolution_timestamp(pcap_t *pcap_h); +int get_pcap_datalink(pcap_t *pch, const char *devicename); +gboolean set_pcap_datalink(pcap_t *pcap_h, int datalink, char *name, + char *errmsg, size_t errmsg_len, + char *secondary_errmsg, size_t secondary_errmsg_len); + +#ifdef HAVE_PCAP_SET_TSTAMP_PRECISION /* * Return TRUE if the pcap_t in question is set up for high-precision * time stamps, FALSE otherwise. */ gboolean have_high_resolution_timestamp(pcap_t *pcap_h); - #endif /* HAVE_PCAP_SET_TSTAMP_PRECISION */ #endif /* HAVE_LIBPCAP */ +extern if_capabilities_t *get_if_capabilities(interface_options *interface_opts, + char **err_str); +extern pcap_t *open_capture_device(capture_options *capture_opts, + interface_options *interface_opts, int timeout, + char (*open_err_str)[PCAP_ERRBUF_SIZE]); + extern void get_compiled_caplibs_version(GString *str); /* |