diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 16 | ||||
| -rw-r--r-- | CMakeOptions.txt | 1 | ||||
| -rw-r--r-- | Makefile.am | 13 | ||||
| -rw-r--r-- | Makefile.nmake | 49 | ||||
| -rw-r--r-- | acinclude.m4 | 31 | ||||
| -rw-r--r-- | adns_dll.dep | 85 | ||||
| -rw-r--r-- | adns_dll.rc | 110 | ||||
| -rw-r--r-- | cmake/modules/FindADNS.cmake | 33 | ||||
| -rw-r--r-- | cmakeconfig.h.in | 3 | ||||
| -rw-r--r-- | config.h.win32 | 8 | ||||
| -rw-r--r-- | config.nmake | 49 | ||||
| -rw-r--r-- | configure.ac | 51 | ||||
| -rw-r--r-- | docbook/wsug_src/WSUG_chapter_build_install.asciidoc | 2 | ||||
| -rw-r--r-- | epan/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | epan/Makefile.am | 1 | ||||
| -rw-r--r-- | epan/Makefile.nmake | 6 | ||||
| -rw-r--r-- | epan/addr_resolv.c | 129 | ||||
| -rw-r--r-- | epan/addr_resolv.h | 2 | ||||
| -rw-r--r-- | epan/epan.c | 8 | ||||
| -rw-r--r-- | extcap/Makefile.nmake | 2 | ||||
| -rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 8 |
22 files changed, 26 insertions, 583 deletions
diff --git a/.gitignore b/.gitignore index 4b1af39b51..ddbc038d6b 100644 --- a/.gitignore +++ b/.gitignore @@ -215,7 +215,6 @@ wsutil/abi-descriptor.xml *.pdb *.nativecodeanalysis.xml *.rc -!adns_dll.rc !image/file_dlg_win32.rc *.res *.vcxproj* diff --git a/CMakeLists.txt b/CMakeLists.txt index f609b8e045..caa319d6b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -741,11 +741,9 @@ if(ENABLE_PORTAUDIO AND BUILD_wireshark_gtk) endif() -# Prefer c-ares over adns -if(ENABLE_CARES) # C Asynchronouse resolver +# C Asynchronous resolver +if(ENABLE_CARES) set(PACKAGELIST ${PACKAGELIST} CARES) -elseif(ENABLE_ADNS) # Gnu asynchronous DNS - set(PACKAGELIST ${PACKAGELIST} ADNS) endif() # Zlib compression @@ -881,12 +879,9 @@ endif() if(HAVE_LIBCARES) set(HAVE_C_ARES 1) endif() -if(HAVE_LIBADNS) - set(HAVE_GNU_ADNS 1) -endif() -if(NOT HAVE_LIBCARES AND NOT HAVE_LIBADNS) +if(NOT HAVE_LIBCARES) # We should make this an error at some point. - message(WARNING "Not using c-ares or ADNS.") + message(WARNING "Not using c-ares.") message(WARNING "Synchronous name resolution can seriously degrade performance.") endif() if(HAVE_LIBNL AND HAVE_AIRPCAP) @@ -1183,7 +1178,6 @@ set( plugindir "\${libdir}/wireshark/plugins/${CPACK_PACKAGE_VERSION}" ) set(ICON_PATH "${CMAKE_SOURCE_DIR}/image/") set( IN_FILES - adns_dll.rc capchild/doxygen.cfg.in caputils/doxygen.cfg.in doxygen.cfg.in @@ -1361,7 +1355,6 @@ set(LIBEPAN_LIBS ${AIRPCAP_LIBRARIES} ${PCAP_LIBRARIES} ${CARES_LIBRARIES} - ${ADNS_LIBRARIES} ${KERBEROS_LIBRARIES} ${LUA_LIBRARIES} ${PYTHON_LIBRARIES} @@ -2136,7 +2129,6 @@ if(BUILD_randpkt) # @SOCKET_LIBS@ # @NSL_LIBS@ ${CARES_LIBRARIES} - ${ADNS_LIBRARIES} ${ZLIB_LIBRARIES} ) set(randpkt_FILES diff --git a/CMakeOptions.txt b/CMakeOptions.txt index e96a102530..52cf9e6855 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -59,7 +59,6 @@ option(ENABLE_PDF_GUIDES "Build PDF User & Developer Guides" OFF) option(ENABLE_CHM_GUIDES "Build HTML Help User & Developer Guides" OFF) option(ENABLE_PCAP_NG_DEFAULT "Enable pcap-ng as default file format" ON) -option(ENABLE_ADNS "Build with adns support" ON) option(ENABLE_PORTAUDIO "Build with PortAudio support" ON) option(ENABLE_ZLIB "Build with zlib compression support" ON) option(ENABLE_LUA "Build with Lua dissector support" ON) diff --git a/Makefile.am b/Makefile.am index 5bc155e581..6f91f391b8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -396,7 +396,6 @@ wireshark_common_ldadd = \ $(plugin_ldadd) \ @PCAP_LIBS@ \ @C_ARES_LIBS@ \ - @ADNS_LIBS@ \ @KRB5_LIBS@ \ @APPLICATIONSERVICES_FRAMEWORKS@ \ @SYSTEMCONFIGURATION_FRAMEWORKS@ \ @@ -454,7 +453,6 @@ tshark_LDADD = \ @SOCKET_LIBS@ \ @NSL_LIBS@ \ @C_ARES_LIBS@ \ - @ADNS_LIBS@ \ @KRB5_LIBS@ \ @SYSTEMCONFIGURATION_FRAMEWORKS@ \ @COREFOUNDATION_FRAMEWORKS@ \ @@ -503,7 +501,6 @@ rawshark_LDADD = \ @SOCKET_LIBS@ \ @NSL_LIBS@ \ @C_ARES_LIBS@ \ - @ADNS_LIBS@ \ @KRB5_LIBS@ \ @SYSTEMCONFIGURATION_FRAMEWORKS@ \ @COREFOUNDATION_FRAMEWORKS@ \ @@ -576,8 +573,7 @@ randpkt_LDADD = \ @PCAP_LIBS@ \ @SOCKET_LIBS@ \ @NSL_LIBS@ \ - @C_ARES_LIBS@ \ - @ADNS_LIBS@ + @C_ARES_LIBS@ dftest_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) @@ -594,7 +590,6 @@ dftest_LDADD = \ @SOCKET_LIBS@ \ @NSL_LIBS@ \ @C_ARES_LIBS@ \ - @ADNS_LIBS@ \ @KRB5_LIBS@ \ @LIBGCRYPT_LIBS@ \ @LIBGNUTLS_LIBS@ \ @@ -610,8 +605,7 @@ echld_test_LDADD = \ @PCAP_LIBS@ \ @SOCKET_LIBS@ \ @NSL_LIBS@ \ - @C_ARES_LIBS@ \ - @ADNS_LIBS@ + @C_ARES_LIBS@ echld_test_DEPENDENCIES = \ echld/libechld.la \ @@ -719,8 +713,6 @@ EXTRA_DIST = \ aclocal-fallback/libsmi.m4 \ aclocal-fallback/libgcrypt.m4 \ aclocal-flags \ - adns_dll.dep \ - adns_dll.rc \ autogen.sh \ capinfos.c \ captype.c \ @@ -1266,7 +1258,6 @@ EXTRA_DIST = \ cmake/modules/CheckCLinkerFlag.cmake \ cmake/modules/CMakeInstallDirs.cmake \ cmake/modules/COPYING-CMAKE-SCRIPTS \ - cmake/modules/FindADNS.cmake \ cmake/modules/FindAIRPCAP.cmake \ cmake/modules/FindASCIIDOC.cmake \ cmake/modules/FindCAP.cmake \ diff --git a/Makefile.nmake b/Makefile.nmake index 110d96624d..92986b3da9 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -41,7 +41,7 @@ GENERATED_CFLAGS=\ $(STANDARD_CFLAGS) \ /I. $(GLIB_CFLAGS) \ $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \ - $(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(GNUTLS_CFLAGS) \ + $(C_ARES_CFLAGS) $(GNUTLS_CFLAGS) \ $(SMI_CFLAGS) $(GEOIP_CFLAGS) $(LIBSSH_CFLAGS) $(WINSPARKLE_CFLAGS) CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS) @@ -88,7 +88,6 @@ wireshark_gtk_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ epan\dfilter\dfilter.lib \ epan\ftypes\ftypes.lib \ $(C_ARES_LIBS) \ - $(ADNS_LIBS) \ $(ZLIB_LIBS) !ENDIF @@ -106,7 +105,6 @@ tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ epan\dfilter\dfilter.lib \ epan\ftypes\ftypes.lib \ $(C_ARES_LIBS) \ - $(ADNS_LIBS) \ $(ZLIB_LIBS) !ENDIF @@ -139,7 +137,6 @@ rawshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ epan\dfilter\dfilter.lib \ epan\ftypes\ftypes.lib \ $(C_ARES_LIBS) \ - $(ADNS_LIBS) \ $(ZLIB_LIBS) !ENDIF @@ -192,7 +189,6 @@ dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \ epan\wireshark.lib \ epan\dfilter\dfilter.lib epan\ftypes\ftypes.lib \ $(C_ARES_LIBS) \ - $(ADNS_LIBS) \ $(ZLIB_LIBS) \ $(SMI_LIBS) !ENDIF @@ -218,7 +214,7 @@ RESOURCES=image\wireshark.res image\file_dlg_win32.res \ image\rawshark.res image\reordercap.res image\libwsutil.res -all: $(LIBS_CHECK) config.h ui\qt\config.pri tools image $(C_ARES_DLL) $(ADNS_DLL) $(ZLIB_DLL) wsutil codecs wiretap epan randpkt_core extcap $(EXECUTABLES) wireshark.bsc $(RESOURCES) help install-all +all: $(LIBS_CHECK) config.h ui\qt\config.pri tools image $(C_ARES_DLL) $(ZLIB_DLL) wsutil codecs wiretap epan randpkt_core extcap $(EXECUTABLES) wireshark.bsc $(RESOURCES) help install-all !IFDEF MAKENSIS packaging: all @@ -441,7 +437,6 @@ config.h : config.h.win32 config.nmake -e s/@VERSION_MICRO@/$(VERSION_MICRO)/ \ -e "s/@VERSION_FLAVOR@/$(VERSION_FLAVOR)/" \ -e "s/@HAVE_C_ARES@/$(C_ARES_CONFIG)/" \ - -e "s/@HAVE_GNU_ADNS@/$(ADNS_CONFIG)/" \ -e "s/@HAVE_KFW@/$(KFW_CONFIG)/" \ -e "s/@HAVE_LIBZ@/$(ZLIB_CONFIG)/" \ -e "s/@HAVE_LIBPCAP@/$(WINPCAP_CONFIG)/" \ @@ -630,9 +625,6 @@ clean: clean-local # "distclean" removes all files not part of the distribution. # It does not remove generated files that are part of the distribution. distclean-local: clean-local -!IFDEF ADNS_DIR - rm -f $(ADNS_DLL) $(ADNS_LIBS) -!ENDIF !IFDEF ZLIB_DIR rm -f $(ZLIB_DLL) $(ZLIB_DIR)\zlib1.dll.manifest \ $(ZLIB_DIR)\include\zlib.h $(ZLIB_DIR)\include\zconf.h \ @@ -750,33 +742,6 @@ image:: $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake cd .. -!IFDEF ADNS_DIR -# MSVC variants supported by Wireshark have to avoid indirectly using msvcrt.dll, -# therefore compile the adns dll from source ADNS_DIR package. -# To avoid path problems, copy the adns sources to a temp dir, -# compile and copy the resulting files back to (source) ADNS_DIR -# -# Unfortunately: -# - we need to "patch" adns_dll.rep and adns_dll.rc (at least for MSVC2005EE) -# -$(ADNS_DLL): - xcopy $(ADNS_DIR) adns.tmp /D /I /E /Y - copy adns_dll.dep adns.tmp\adns_win32\adns_dll - copy adns_dll.rc adns.tmp\adns_win32\adns_dll - cd adns.tmp\adns_win32\adns_dll - set CFG=adns_dll - Win32 Release - $(MAKE) /$(MAKEFLAGS) -f adns_dll.mak LOC="$(LOCAL_CFLAGS)" - cd ..\lib -!IFDEF MANIFEST_INFO_REQUIRED - mt.exe -nologo -manifest "adns_dll.dll.manifest" -outputresource:adns_dll.dll;2 -!ENDIF - if not exist "$(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns" mkdir "$(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns" - copy adns_dll.dll $(ADNS_DLL) - copy adns_dll.lib $(ADNS_LIBS) - cd ..\..\.. - rm -r -f adns.tmp -!ENDIF - !IFDEF ZLIB_DIR # MSVC variants supported by Wireshark have to avoid indirectly using msvcrt.dll, # therefore compile the zlib dll from source ZLIB_DIR package. @@ -1049,12 +1014,6 @@ process_libs: c-ares-$(C_ARES_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip \ "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" !ENDIF -!IFDEF ADNS_DIR - @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ - . \ - adns-1.0-win32-05ws.zip \ - "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)" -!ENDIF !IFDEF ZLIB_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \ . zlib-1.2.8-ws.zip \ @@ -1137,7 +1096,6 @@ process_libs: # UPDATING REMOVES THE FORMER USER DIRS clean_setup: cd "$(WIRESHARK_LIB_DIR)" - rm -r -f adns-1.0-win32-05ws rm -r -f c-ares-1.5.3ws rm -r -f c-ares-1.6.0ws rm -r -f c-ares-1.7.0-win??ws @@ -1440,9 +1398,6 @@ install-all: install-generated-files !IFDEF C_ARES_DIR xcopy $(C_ARES_DLL) $(INSTALL_DIR) /d !ENDIF -!IFDEF ADNS_DIR - xcopy $(ADNS_DLL) $(INSTALL_DIR) /d -!ENDIF !IFDEF KFW_DIR xcopy $(KFW_PATH)\$(COMERR_DLL) $(INSTALL_DIR) /d xcopy $(KFW_PATH)\$(KRB5_DLL) $(INSTALL_DIR) /d diff --git a/acinclude.m4 b/acinclude.m4 index 81d385e043..2e3c1ed46c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1014,37 +1014,6 @@ AC_DEFUN([AC_WIRESHARK_C_ARES_CHECK], # -# AC_WIRESHARK_ADNS_CHECK -# -AC_DEFUN([AC_WIRESHARK_ADNS_CHECK], -[ - want_adns=defaultyes - - if test "x$want_adns" = "xdefaultyes"; then - want_adns=yes - if test "x$ac_cv_enable_usr_local" = "xyes" ; then - withval=/usr/local - if test -d "$withval"; then - AC_WIRESHARK_ADD_DASH_L(WS_LDFLAGS, ${withval}/lib) - fi - fi - fi - - if test "x$want_adns" = "xyes"; then - AC_CHECK_LIB(adns, adns_init, - [ - ADNS_LIBS=-ladns - AC_DEFINE(HAVE_GNU_ADNS, 1, [Define to use GNU ADNS library]) - have_good_adns=yes - ],, $SOCKET_LIBS $NSL_LIBS - ) - else - AC_MSG_RESULT(not required) - fi -]) - - -# # AC_WIRESHARK_LIBCAP_CHECK # AC_DEFUN([AC_WIRESHARK_LIBCAP_CHECK], diff --git a/adns_dll.dep b/adns_dll.dep deleted file mode 100644 index 1ba458aa95..0000000000 --- a/adns_dll.dep +++ /dev/null @@ -1,85 +0,0 @@ -# Microsoft Developer Studio Generated Dependency File, included by adns_dll.mak - -.\adns_dll.cpp : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - - -..\adns_unix_calls.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - - -..\..\src\check.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - "..\..\src\config.h"\ - "..\..\src\dlist.h"\ - "..\..\src\internal.h"\ - - -..\..\src\event.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - "..\..\src\config.h"\ - "..\..\src\dlist.h"\ - "..\..\src\internal.h"\ - "..\..\src\tvarith.h"\ - - -..\..\src\general.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - "..\..\src\config.h"\ - "..\..\src\dlist.h"\ - "..\..\src\internal.h"\ - - -..\..\src\parse.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - "..\..\src\config.h"\ - "..\..\src\dlist.h"\ - "..\..\src\internal.h"\ - - -..\..\src\query.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - "..\..\src\config.h"\ - "..\..\src\dlist.h"\ - "..\..\src\internal.h"\ - - -..\..\src\reply.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - "..\..\src\config.h"\ - "..\..\src\dlist.h"\ - "..\..\src\internal.h"\ - - -..\..\src\setup.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - "..\..\src\config.h"\ - "..\..\src\dlist.h"\ - "..\..\src\internal.h"\ - - -..\..\src\transmit.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - "..\..\src\config.h"\ - "..\..\src\dlist.h"\ - "..\..\src\internal.h"\ - "..\..\src\tvarith.h"\ - - -..\..\src\types.c : \ - "..\..\src\adns.h"\ - "..\..\src\adns_win32.h"\ - "..\..\src\config.h"\ - "..\..\src\dlist.h"\ - "..\..\src\internal.h"\ - diff --git a/adns_dll.rc b/adns_dll.rc deleted file mode 100644 index 4ac8664ef5..0000000000 --- a/adns_dll.rc +++ /dev/null @@ -1,110 +0,0 @@ -//Microsoft Developer Studio generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -// WIRESHARK: this makes problem on some machines -//#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Norwegian (Bokmal) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NOR) -//#ifdef _WIN32 -//LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL -//#pragma code_page(1252) -//#endif //_WIN32 - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,5 - PRODUCTVERSION 1,0,0,5 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x1L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000004b0" - BEGIN - VALUE "Comments", "Lisenced under GPL - see www.gnu.org\0" - VALUE "CompanyName", "Jgaa's Internet www.jgaa.com\0" - VALUE "FileDescription", "adns resolver library\0" - VALUE "FileVersion", "1, 0, 0, 5\0" - VALUE "InternalName", "adns-win32\0" - VALUE "LegalCopyright", "Copyright © 2000, 2001, 2002 , 2003 Ian Jackson, Jarle Aase\0" - VALUE "LegalTrademarks", "\0" - VALUE "OriginalFilename", "adns_dll.dll\0" - VALUE "PrivateBuild", "\0" - VALUE "ProductName", "GNU adns\0" - VALUE "ProductVersion", "1, 0, 0, 5\0" - VALUE "SpecialBuild", "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0, 1200 - END -END - -#endif // !_MAC - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // Norwegian (Bokmal) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/cmake/modules/FindADNS.cmake b/cmake/modules/FindADNS.cmake deleted file mode 100644 index 596019556f..0000000000 --- a/cmake/modules/FindADNS.cmake +++ /dev/null @@ -1,33 +0,0 @@ -# -# - Find adns -# Find the native ADNS includes and library -# -# ADNS_INCLUDE_DIRS - where to find adns.h, etc. -# ADNS_LIBRARIES - List of libraries when using adns. -# ADNS_FOUND - True if adns found. - - -IF (ADNS_INCLUDE_DIRS) - # Already in cache, be silent - SET(ADNS_FIND_QUIETLY TRUE) -ENDIF (ADNS_INCLUDE_DIRS) - -FIND_PATH(ADNS_INCLUDE_DIR adns.h) - -SET(ADNS_NAMES adns) -FIND_LIBRARY(ADNS_LIBRARY NAMES ${ADNS_NAMES} ) - -# handle the QUIETLY and REQUIRED arguments and set ADNS_FOUND to TRUE if -# all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(ADNS DEFAULT_MSG ADNS_LIBRARY ADNS_INCLUDE_DIR) - -IF(ADNS_FOUND) - SET( ADNS_LIBRARIES ${ADNS_LIBRARY} ) - SET( ADNS_INCLUDE_DIRS ${ADNS_INCLUDE_DIR} ) -ELSE(ADNS_FOUND) - SET( ADNS_LIBRARIES ) - SET( ADNS_INCLUDE_DIRS ) -ENDIF(ADNS_FOUND) - -MARK_AS_ADVANCED( ADNS_LIBRARIES ADNS_INCLUDE_DIRS ) diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in index 6fa2dc14bd..52e34567d2 100644 --- a/cmakeconfig.h.in +++ b/cmakeconfig.h.in @@ -106,9 +106,6 @@ /* Define to 1 if you have the `getprotobynumber' function. */ #cmakedefine HAVE_GETPROTOBYNUMBER 1 -/* Define to use GNU ADNS library */ -#cmakedefine HAVE_GNU_ADNS 1 - /* Define to 1 if you have the <grp.h> header file. */ #cmakedefine HAVE_GRP_H 1 diff --git a/config.h.win32 b/config.h.win32 index 5faac21994..9301ad308d 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -170,15 +170,9 @@ #define HAVE_INFLATEPRIME 1 #endif -/* Define to use GNU ADNS library */ +/* Define to use c-ares library */ @HAVE_C_ARES@ -/* Define to use GNU ADNS library */ -#ifndef HAVE_C_ARES -@HAVE_GNU_ADNS@ -#define ADNS_JGAA_WIN32 1 -#endif - /* Define to use the gnutls library */ @HAVE_LIBGNUTLS@ diff --git a/config.nmake b/config.nmake index c899915d5e..44b0ee20ef 100644 --- a/config.nmake +++ b/config.nmake @@ -389,26 +389,11 @@ PCAP_REMOTE=1 ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib-1.2.8-ws # -# Optional: the ADNS library enables asynchronous (nonblocking) DNS -# name resolvings. -# -# If you have GNU ADNS, set this to the directory in which the GNU ADNS -# .lib file is stored. -# -# If you don't have GNU ADNS, comment this line out, so that ADNS_DIR -# isn't defined. -# -# If C_ARES_DIR is defined below, it will override this setting. -# -#ADNS_DIR=$(WIRESHARK_LIB_DIR)\adns-1.0-win32-05ws - -# # Optional: the c-ares library enables asynchronous (nonblocking) DNS # name resolvings. # # If you have c-ares, set this to the directory in which the c-ares -# .lib file is stored. Setting this will override ADNS_DIR above. You -# can't have both. +# .lib file is stored. # # If you're using Visual C++ 6.0, you'll have to use a platform SDK that # defines socklen_t, such as Windows Server 2003 PSDK. @@ -649,26 +634,11 @@ PCAP_REMOTE=1 ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib-1.2.8-ws # -# Optional: the ADNS library enables asynchronous (nonblocking) DNS -# name resolvings. -# -# If you have GNU ADNS, set this to the directory in which the GNU ADNS -# .lib file is stored. -# -# If you don't have GNU ADNS, comment this line out, so that ADNS_DIR -# isn't defined. -# -# If C_ARES_DIR is defined below, it will override this setting. -# -#ADNS_DIR=$(WIRESHARK_LIB_DIR)\adns-1.0-win32-05ws - -# # Optional: the c-ares library enables asynchronous (nonblocking) DNS # name resolvings. # # If you have c-ares, set this to the directory in which the c-ares -# .lib file is stored. Setting this will override ADNS_DIR above. You -# can't have both. +# .lib file is stored. # # If you're using Visual C++ 6.0, you'll have to use a platform SDK that # defines socklen_t, such as Windows Server 2003 PSDK. @@ -1625,7 +1595,6 @@ ZLIB_CONFIG= !ENDIF !IFDEF C_ARES_PKG -!UNDEF ADNS_DIR C_ARES_DIR=$(WIRESHARK_LIB_DIR)\c-ares-$(C_ARES_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws C_ARES_CFLAGS=/I$(C_ARES_DIR)/include C_ARES_LIBS=$(C_ARES_DIR)\lib\libcares-2.lib @@ -1636,18 +1605,6 @@ C_ARES_CONFIG=^#define HAVE_C_ARES 1 C_ARES_CFLAGS= C_ARES_LIBS= C_ARES_CONFIG= -!IFDEF ADNS_DIR -ADNS_PATH=$(ADNS_DIR)\adns_win32\lib -ADNS_CFLAGS=/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32 -ADNS_LIBS=$(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns\adns_dll.lib -ADNS_DLL=$(WIRESHARK_LIB_DIR)\$(MSVC_VARIANT)\adns\adns_dll.dll -# Nmake uses carets to escape special characters -ADNS_CONFIG=^#define HAVE_GNU_ADNS 1 -!else -ADNS_CFLAGS= -ADNS_LIBS= -ADNS_CONFIG= -!ENDIF # ADNS !ENDIF # C_ARES !IFDEF KFW_DIR @@ -1770,6 +1727,6 @@ LIBWIRESHARK_CONFIG= !ENDIF # Construct the path -PATH=$(PATH);$(CYGWIN_PATH);$(GTK_DIR)\bin;$(GETTEXT_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH) +PATH=$(PATH);$(CYGWIN_PATH);$(GTK_DIR)\bin;$(GETTEXT_DIR)\bin;$(ZLIB_PATH) NTDDNDIS_CONFIG=^#define HAVE_NTDDNDIS_H 1 diff --git a/configure.ac b/configure.ac index 1d50639bb8..04e83c5e1d 100644 --- a/configure.ac +++ b/configure.ac @@ -1467,7 +1467,7 @@ if test "x$ac_cv_enable_usr_local" = "xyes" ; then # # Arrange that we search for header files in the source directory # and in its "wiretap" subdirectory, as well as in "/usr/local/include", - # as various packages we use ("libpcap", "zlib", "adns") + # as various packages we use ("libpcap", "zlib", "c-ares") # may have been installed under "/usr/local/include". # AX_APPEND_FLAG([-I/usr/local/include], [WS_CPPFLAGS]) @@ -2677,7 +2677,7 @@ AC_MSG_CHECKING(whether to use the c-ares library if available) AC_ARG_WITH(c-ares, AC_HELP_STRING( [--with-c-ares@<:@=DIR@:>@], - [use c-ares (located in directory DIR, if supplied) - supersedes --with-adns @<:@default=yes, if present@:>@]), + [use c-ares (located in directory DIR, if supplied) @<:@default=yes, if present@:>@]), [ if test "x$withval" = "xno"; then want_c_ares=no @@ -2696,32 +2696,7 @@ else fi AC_SUBST(C_ARES_LIBS) -dnl ADNS Check -ADNS_LIBS='' -AC_MSG_CHECKING(whether to use the GNU ADNS library if available) - -AC_ARG_WITH(adns, - AC_HELP_STRING( [--with-adns@<:@=DIR@:>@], - [use GNU ADNS (located in directory DIR, if supplied) @<:@default=yes, if present@:>@]), -[ -if test "x$withval" = "xno"; then - want_adns=no -elif test "x$withval" = "xyes"; then - want_adns=yes -elif test -d "$withval"; then - want_adns=yes - AC_WIRESHARK_ADD_DASH_L(WS_LDFLAGS, ${withval}/lib) -fi -]) -if test "x$want_adns" = "xno" -o "x$have_good_c_ares" = "xyes" ; then - AC_MSG_RESULT(no) -else - AC_MSG_RESULT(yes) - AC_WIRESHARK_ADNS_CHECK -fi -AC_SUBST(ADNS_LIBS) - -if test "x$have_good_c_ares" != "xyes" -a "x$have_good_adns" != "xyes"; then +if test "x$have_good_c_ares" != "xyes"; then # We don't have an asynchronous name resolver, look for a synchronous one dnl Checks for "getaddrinfo()" - and "-lnsl", if we need it to get @@ -3443,23 +3418,8 @@ fi if test "x$have_good_c_ares" = "xyes" ; then c_ares_message="yes" else - if test "x$have_good_adns" = "xyes" ; then - c_ares_message="no" - else - # We should make this an error at some point. - c_ares_message="no. This can cause serious performance issues." - fi -fi - -if test "x$have_good_adns" = "xyes" ; then - adns_message="yes" -else - if test "x$have_good_c_ares" = "xyes" ; then - adns_message="no (using c-ares instead)" - else - # We should make this an error at some point. - adns_message="no. This can cause serious performance issues." - fi + # We should make this an error at some point. + c_ares_message="no. This can cause serious performance issues." fi if test "x$have_good_libcap" = "xyes" ; then @@ -3532,7 +3492,6 @@ echo " Use pcap library : $want_pcap" echo " Use zlib library : $zlib_message" echo " Use kerberos library : $krb5_message" echo " Use c-ares library : $c_ares_message" -echo " Use GNU ADNS library : $adns_message" echo " Use SMI MIB library : $libsmi_message" echo " Use GNU crypto library : $gcrypt_message" echo " Use SSL crypto library : $ssl_message" diff --git a/docbook/wsug_src/WSUG_chapter_build_install.asciidoc b/docbook/wsug_src/WSUG_chapter_build_install.asciidoc index b7fd4620ff..bb54b46b6d 100644 --- a/docbook/wsug_src/WSUG_chapter_build_install.asciidoc +++ b/docbook/wsug_src/WSUG_chapter_build_install.asciidoc @@ -384,7 +384,7 @@ Use the following command to install Wireshark under Gentoo Linux with all of the extra features: ---- -$ USE="adns gtk ipv6 portaudio snmp ssl kerberos threads selinux" emerge wireshark +$ USE="c-ares gtk ipv6 portaudio snmp ssl kerberos threads selinux" emerge wireshark ---- ==== Installing from packages under FreeBSD diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 49321d88e2..82d0169d3e 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -192,7 +192,6 @@ set(epan_LIBS ${GLIB2_LIBRARIES} ${PCAP_LIBRARIES} ${CARES_LIBRARIES} - ${ADNS_LIBRARIES} ${KERBEROS_LIBRARIES} ${GEOIP_LIBRARIES} ${GCRYPT_LIBRARIES} diff --git a/epan/Makefile.am b/epan/Makefile.am index 3a830e59df..1585861e7b 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -139,7 +139,6 @@ libwireshark_la_LIBADD = \ @SOCKET_LIBS@ \ @NSL_LIBS@ \ @C_ARES_LIBS@ \ - @ADNS_LIBS@ \ @LIBGCRYPT_LIBS@ \ @LIBGNUTLS_LIBS@ \ @KRB5_LIBS@ \ diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake index 984bd85056..7ff028a60c 100644 --- a/epan/Makefile.nmake +++ b/epan/Makefile.nmake @@ -16,7 +16,7 @@ LINK= link COMMON_CFLAGS=\ $(STANDARD_CFLAGS) \ /I. /I.. $(GLIB_CFLAGS) \ - $(ZLIB_CFLAGS) $(C_ARES_CFLAGS) $(ADNS_CFLAGS) \ + $(ZLIB_CFLAGS) $(C_ARES_CFLAGS) \ $(LUA_CFLAGS) $(GNUTLS_CFLAGS) /I$(PCAP_DIR)\include \ $(SMI_CFLAGS) $(GEOIP_CFLAGS) @@ -56,7 +56,6 @@ WSLUA_DIR= libwireshark_LIBS = \ $(GLIB_LIBS) \ $(C_ARES_LIBS) \ - $(ADNS_LIBS) \ $(KFW_LIBS) \ $(ZLIB_LIBS) \ $(GNUTLS_LIBS) \ @@ -289,7 +288,6 @@ TVBTEST_LIBS= ..\wiretap\wiretap-$(WTAP_VERSION).lib \ dfilter\dfilter.lib \ ftypes\ftypes.lib \ $(C_ARES_LIBS) \ - $(ADNS_LIBS) \ $(ZLIB_LIBS) !ENDIF @@ -319,7 +317,6 @@ OIDS_TEST_LIBS= ..\wiretap\wiretap-$(WTAP_VERSION).lib \ ftypes\ftypes.lib \ wmem\wmem.lib \ $(C_ARES_LIBS) \ - $(ADNS_LIBS) \ $(ZLIB_LIBS) !ENDIF @@ -348,7 +345,6 @@ REASSEMBLE_TEST_LIBS= ..\wiretap\wiretap-$(WTAP_VERSION).lib \ dfilter\dfilter.lib \ ftypes\ftypes.lib \ $(C_ARES_LIBS) \ - $(ADNS_LIBS) \ $(ZLIB_LIBS) !ENDIF diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index f1c3d79335..d4d9db58a9 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -42,12 +42,6 @@ * resolution code that sends messages to lookupd might be inconsistent * if you jump out of it in middle of a call. * - * In at least some Linux distributions (e.g., RedHat Linux 9), if ADNS - * is used, we appear to hang in host_name_lookup6() in a gethostbyaddr() - * call (and possibly in other gethostbyaddr() calls), because there's - * a mutex lock held in gethostbyaddr() and it doesn't get released - * if we longjmp out of it. - * * There's no guarantee that longjmp()ing out of name resolution calls * will work on *any* platform; OpenBSD got rid of the alarm/longjmp * code in tcpdump, to avoid those sorts of problems, and that was @@ -94,14 +88,6 @@ # endif # include <ares.h> # include <ares_version.h> -#else -# ifdef HAVE_GNU_ADNS -# include <errno.h> -# include <adns.h> -# if defined(inet_aton) && defined(_WIN32) -# undef inet_aton -# endif -# endif /* HAVE_GNU_ADNS */ #endif /* HAVE_C_ARES */ #include <glib.h> @@ -304,7 +290,7 @@ e_addr_resolve gbl_resolv_flags = { FALSE, /* load_hosts_file_from_profile_only */ FALSE /* vlan_name */ }; -#if defined(HAVE_C_ARES) || defined(HAVE_GNU_ADNS) +#ifdef HAVE_C_ARES static guint name_resolve_concurrency = 500; #endif @@ -357,30 +343,8 @@ static void c_ares_ghba_cb(void *arg, int status, int timeouts _U_, struct hoste ares_channel ghba_chan; /* ares_gethostbyaddr -- Usually non-interactive, no timeout */ ares_channel ghbn_chan; /* ares_gethostbyname -- Usually interactive, timeout */ - -#else -/* GNU ADNS */ -#ifdef HAVE_GNU_ADNS -#define ASYNC_DNS -/* - * Submitted queries have to be checked individually using adns_check(). - * Queries are added to adns_queue_head. During processing, the list is - * iterated twice: once to request queries up to the concurrency limit, - * and once to check the status of each query. - */ - -adns_state ads; - -typedef struct _async_dns_queue_msg -{ - gboolean submitted; - guint32 ip4_addr; - int type; - adns_query query; -} async_dns_queue_msg_t; - -#endif /* HAVE_GNU_ADNS */ #endif /* HAVE_C_ARES */ + #ifdef ASYNC_DNS static gboolean async_dns_initialized = FALSE; static guint async_dns_in_flight = 0; @@ -393,18 +357,11 @@ add_async_dns_ipv4(int type, guint32 addr) async_dns_queue_msg_t *msg; msg = g_new(async_dns_queue_msg_t,1); -#ifdef HAVE_C_ARES msg->family = type; msg->addr.ip4 = addr; -#else - msg->type = type; - msg->ip4_addr = addr; - msg->submitted = FALSE; -#endif async_dns_queue_head = g_list_append(async_dns_queue_head, (gpointer) msg); } - -#endif +#endif /* ASYNC_DNS */ typedef struct { guint32 mask; @@ -2512,7 +2469,7 @@ addr_resolve_pref_init(module_t *nameres) " is enabled.", &gbl_resolv_flags.use_external_net_name_resolver); -#if defined(HAVE_C_ARES) || defined(HAVE_GNU_ADNS) +#ifdef HAVE_C_ARES prefs_register_bool_preference(nameres, "concurrent_dns", "Enable concurrent DNS name resolution", "Enable concurrent DNS name resolution. Only" @@ -2632,83 +2589,7 @@ _host_name_lookup_cleanup(void) { async_dns_initialized = FALSE; } -#elif defined(HAVE_GNU_ADNS) - -/* XXX - The ADNS "documentation" isn't very clear: - * - Do we need to keep our query structures around? - */ -gboolean -host_name_lookup_process(void) { - async_dns_queue_msg_t *almsg; - GList *cur; - char addr_str[] = "111.222.333.444.in-addr.arpa."; - guint8 *addr_bytes; - adns_answer *ans; - int ret; - gboolean dequeue; - gboolean nro = new_resolved_objects; - - new_resolved_objects = FALSE; - async_dns_queue_head = g_list_first(async_dns_queue_head); - - cur = async_dns_queue_head; - while (cur && async_dns_in_flight <= name_resolve_concurrency) { - almsg = (async_dns_queue_msg_t *) cur->data; - if (! almsg->submitted && almsg->type == AF_INET) { - addr_bytes = (guint8 *) &almsg->ip4_addr; - g_snprintf(addr_str, sizeof addr_str, "%u.%u.%u.%u.in-addr.arpa.", addr_bytes[3], - addr_bytes[2], addr_bytes[1], addr_bytes[0]); - /* XXX - what if it fails? */ - adns_submit (ads, addr_str, adns_r_ptr, adns_qf_none, NULL, &almsg->query); - almsg->submitted = TRUE; - async_dns_in_flight++; - } - cur = cur->next; - } - - cur = async_dns_queue_head; - while (cur) { - dequeue = FALSE; - almsg = (async_dns_queue_msg_t *) cur->data; - if (almsg->submitted) { - ret = adns_check(ads, &almsg->query, &ans, NULL); - if (ret == 0) { - if (ans->status == adns_s_ok) { - add_ipv4_name(almsg->ip4_addr, *ans->rrs.str); - } - dequeue = TRUE; - } - } - cur = cur->next; - if (dequeue) { - async_dns_queue_head = g_list_remove(async_dns_queue_head, (void *) almsg); - g_free(almsg); - /* XXX, what to do if async_dns_in_flight == 0? */ - async_dns_in_flight--; - } - } - - /* Keep the timeout in place */ - return nro; -} - -static void -_host_name_lookup_cleanup(void) { - void *qdata; - - async_dns_queue_head = g_list_first(async_dns_queue_head); - while (async_dns_queue_head) { - qdata = async_dns_queue_head->data; - async_dns_queue_head = g_list_remove(async_dns_queue_head, qdata); - g_free(qdata); - } - - if (async_dns_initialized) - adns_finish(ads); - async_dns_initialized = FALSE; -} - -#else /* HAVE_GNU_ADNS */ +#else gboolean host_name_lookup_process(void) { diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h index 876aff2bc9..e1b49cdce8 100644 --- a/epan/addr_resolv.h +++ b/epan/addr_resolv.h @@ -173,7 +173,7 @@ extern void addr_resolve_pref_init(struct pref_module *nameres); */ WS_DLL_PUBLIC void disable_name_resolution(void); -/** If we're using c-ares or ADNS, process outstanding host name lookups. +/** If we're using c-ares process outstanding host name lookups. * This is called from a GLIB timeout in Wireshark and before processing * each packet in TShark. * diff --git a/epan/epan.c b/epan/epan.c index d33544e681..8f2a4d4962 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -511,14 +511,6 @@ epan_get_compiled_version_info(GString *str) g_string_append(str, "with c-ares " ARES_VERSION_STR); #else g_string_append(str, "without c-ares"); - - /* ADNS - only add if no c-ares */ - g_string_append(str, ", "); -#ifdef HAVE_GNU_ADNS - g_string_append(str, "with ADNS"); -#else - g_string_append(str, "without ADNS"); -#endif /* HAVE_GNU_ADNS */ #endif /* HAVE_C_ARES */ /* LUA */ diff --git a/extcap/Makefile.nmake b/extcap/Makefile.nmake index 6fffad7599..3e8cfd804b 100644 --- a/extcap/Makefile.nmake +++ b/extcap/Makefile.nmake @@ -19,7 +19,7 @@ GENERATED_CFLAGS=\ $(STANDARD_CFLAGS) \ /I. /I.. $(GLIB_CFLAGS) \ $(ZLIB_CFLAGS) /I$(PCAP_DIR)\include $(AIRPCAP_CFLAGS) \ - $(C_ARES_CFLAGS) $(ADNS_CFLAGS) $(GNUTLS_CFLAGS) \ + $(C_ARES_CFLAGS) $(GNUTLS_CFLAGS) \ $(SMI_CFLAGS) $(GEOIP_CFLAGS) $(LIBSSH_CFLAGS) $(WINSPARKLE_CFLAGS) CFLAGS=$(WARNINGS_ARE_ERRORS) $(GENERATED_CFLAGS) diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index a6b9c84383..c7fc0e4a59 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -9,7 +9,6 @@ %bcond_with lua # Set these to 1 if you want to ensure your package includes support for them: -%global with_adns 0 %global with_c_ares 1 %global with_portaudio 0 @@ -68,10 +67,6 @@ BuildRequires: c-ares-devel Requires: c-ares %endif %endif -%if %{with_adns} -BuildRequires: adns-devel -Requires: adns -%endif %if %{with lua} BuildRequires: lua-devel < 5.3 Requires: lua < 5.3 @@ -230,9 +225,6 @@ This package contains the GTK+ Wireshark GUI and desktop integration files. %if %{with_c_ares} --with-c-ares \ %endif -%if %{with_adns} - --with-adns \ -%endif %if %{with lua} --with-lua \ %endif |