diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-01-04 12:58:49 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-01-04 20:59:14 +0000 |
| commit | 5653fcedca8491829d6d6ce480e7fba13ff801d7 (patch) | |
| tree | 02c5a736c109823786d737cf1f229e7a20135ee8 /cmake | |
| parent | 9aeb24994364c9a3a983b4aa8db4725b1213d64d (diff) | |
| download | wireshark-5653fcedca8491829d6d6ce480e7fba13ff801d7.tar.gz | |
No *pcap should have pcap_open() without the other remote extensions.
WinPcap 3.0 introduced pcap_open(); it also introduced
pcap_findalldevs_ex() and pcap_createsrcstr(). If you're going to put
pcap_open() in libpcap, there's not much point to doing so but not also
putting pcap_findalldevs_ex() and pcap_createsrcstr() there.
(And, in the future, there'll be support for remote capturing with
pcap_create() and pcap_activate(), with no need for pcap_createsrcstr(),
and a replacement for pcap_findalldevs() and pcap_findalldevs_ex(),
which we'll also check for.)
So there's no need to check for pcap_findalldevs_ex() or
pcap_createsrcstr().
Change-Id: I9323aad20136684d05d1e909326792a2f1408887
Reviewed-on: https://code.wireshark.org/review/6311
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindPCAP.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake index 9e29881618..fe4018f094 100644 --- a/cmake/modules/FindPCAP.cmake +++ b/cmake/modules/FindPCAP.cmake @@ -80,9 +80,7 @@ check_function_exists( "pcap_setsampling" HAVE_PCAP_SETSAMPLING ) check_function_exists( "pcap_set_tstamp_precision" HAVE_PCAP_SET_TSTAMP_PRECISION ) # Remote pcap checks check_function_exists( "pcap_open" HAVE_PCAP_OPEN ) -check_function_exists( "pcap_findalldevs_ex" H_FINDALLDEVS_EX ) -check_function_exists( "pcap_createsrcstr" H_CREATESRCSTR ) -if( HAVE_PCAP_OPEN AND H_FINDALLDEVS_EX AND H_CREATESRCSTR ) +if( HAVE_PCAP_OPEN ) set( HAVE_PCAP_REMOTE 1 ) set( HAVE_REMOTE 1 ) endif() |