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 /cmake | |
| 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 'cmake')
| -rw-r--r-- | cmake/modules/FindPCAP.cmake | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake index d49cd35629..c362cc0c3b 100644 --- a/cmake/modules/FindPCAP.cmake +++ b/cmake/modules/FindPCAP.cmake @@ -61,21 +61,16 @@ check_function_exists( "pcap_freecode" HAVE_PCAP_FREECODE ) # update libpcap without updating the headers. # check_function_exists( "pcap_breakloop" HAVE_PCAP_BREAKLOOP ) -# FIXME: The code (at least) in dumpcap assumes that PCAP_CREATE is not -# available on Windows -if( WIN32 ) - # - # This is always the case with WinPcap. - # - set(CAN_SET_CAPTURE_BUFFER_SIZE TRUE) -else() - check_function_exists( "pcap_create" HAVE_PCAP_CREATE ) - if ( HAVE_PCAP_CREATE ) - # - # For libpcap, we can set the buffer size if we have pcap_create(). - # - set( CAN_SET_CAPTURE_BUFFER_SIZE TRUE ) - endif() +check_function_exists( "pcap_create" HAVE_PCAP_CREATE ) +if( HAVE_PCAP_CREATE OR WIN32 ) + # + # If we have pcap_create(), we have pcap_set_buffer_size(), and + # can set the capture buffer size. + # + # Otherwise, if this is Windows, we have pcap_setbuff(), and can + # set the capture buffer size. + # + set( CAN_SET_CAPTURE_BUFFER_SIZE TRUE ) endif() check_function_exists( "pcap_datalink_name_to_val" HAVE_PCAP_DATALINK_NAME_TO_VAL ) check_function_exists( "pcap_datalink_val_to_description" HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION ) |