diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-05-10 14:15:55 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-05-10 21:16:29 +0000 |
| commit | d13b8ea13cf708a7770e7f51912ce16d0b43e459 (patch) | |
| tree | 3b3b37e9020e802b8bc607ff322996fc650f6884 | |
| parent | 537eddbc407d891430d9f4a2d462c6c3c0753307 (diff) | |
Get rid of HAVE_REMOTE.
We never test for it - we test for HAVE_PCAP_REMOTE - so there's no need
to set it in config.h.
While we're at it, note that "PCAP" in "HAVE_PCAP_REMOTE" can refer to
libpcap as well as WinPcap, given that, at least in the tip of the
master branch, you can configure remote support in libpcap, although
it's not enabled by default (it needs to be vetted for security, as it
increases the attack surface of a machine running the server *and* of an
application using libpcap with remote support).
Change-Id: I3c96cf16bbda19ec7c085f74cffc6f125198d45b
Reviewed-on: https://code.wireshark.org/review/21589
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | acinclude.m4 | 4 | ||||
| -rw-r--r-- | cmake/modules/FindPCAP.cmake | 1 | ||||
| -rw-r--r-- | cmakeconfig.h.in | 6 |
3 files changed, 2 insertions, 9 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 11c657fd87..fcbbab8327 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -423,12 +423,10 @@ AC_DEFUN([AC_WIRESHARK_PCAP_REMOTE_CHECK], [ ac_save_LIBS="$LIBS" LIBS="$PCAP_LIBS $LIBS" - AC_DEFINE(HAVE_REMOTE, 1, [Define to 1 to enable remote - capturing feature in WinPcap library]) AC_CHECK_FUNCS(pcap_open) if test $ac_cv_func_pcap_open = "yes" ; then AC_DEFINE(HAVE_PCAP_REMOTE, 1, - [Define to 1 if you have WinPcap remote capturing support and prefer to use these new API features.]) + [Define to 1 if you have libpcap/WinPcap remote capturing support and prefer to use these new API features.]) fi AC_CHECK_FUNCS(pcap_setsampling) LIBS="$ac_save_LIBS" diff --git a/cmake/modules/FindPCAP.cmake b/cmake/modules/FindPCAP.cmake index 85053abff4..508d46b3a7 100644 --- a/cmake/modules/FindPCAP.cmake +++ b/cmake/modules/FindPCAP.cmake @@ -89,7 +89,6 @@ if( PCAP_FOUND ) check_function_exists( "pcap_open" HAVE_PCAP_OPEN ) if( HAVE_PCAP_OPEN ) set( HAVE_PCAP_REMOTE 1 ) - set( HAVE_REMOTE 1 ) endif() cmake_pop_check_state() diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index 043c6ada08..cfb01047c0 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -266,8 +266,7 @@ /* Define to 1 if you have the `pcap_open_dead' function. */ #cmakedefine HAVE_PCAP_OPEN_DEAD 1 -/* Define to 1 if you have WinPcap remote capturing support and prefer to use - these new API features. */ +/* Define to 1 if you have libpcap/WinPcap remote capturing support. */ #cmakedefine HAVE_PCAP_REMOTE 1 /* Define to 1 if you have the `pcap_set_datalink' function. */ @@ -291,9 +290,6 @@ /* Define to 1 if you have the optreset variable */ #cmakedefine HAVE_OPTRESET 1 -/* Define to 1 to enable remote capturing feature in WinPcap library */ -#cmakedefine HAVE_REMOTE 1 - /* Define if sa_len field exists in struct sockaddr */ #cmakedefine HAVE_STRUCT_SOCKADDR_SA_LEN 1 |