mirrors/tcpdump
0
0
Fork 0
mirror of https://github.com/the-tcpdump-group/tcpdump.git synced 2024-11-27 03:53:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do more substitution for missing libpcap functions.

Browse Source 
Clean up some comments while we're at it.
This commit is contained in:
Guy Harris 2018-01-21 19:46:03 -08:00
parent 2a3509a466
commit a7b0e673fe
2 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
CMakeLists.txt
View File

@ -343,23 +343,38 @@ include_directories(${PCAP_INCLUDE_DIR})
cmake_push_check_state()
set(CMAKE_REQUIRED_LIBRARIES ${PCAP_LIBRARY})
#
# Check for "pcap_list_datalinks()" and use a substitute version if
# it's not present. If it is present, check for "pcap_free_datalinks()";
# if it's not present, we don't replace it for now. (We could do so
# on UN*X, but not on Windows, where hilarity ensues if a program
# built with one version of the MSVC support library tries to free
# something allocated by a library built with another version of
# the MSVC support library.)
#
check_function_exists(pcap_list_datalinks HAVE_PCAP_LIST_DATALINKS)
if(HAVE_PCAP_LIST_DATALINKS)
check_function_exists(pcap_free_datalinks HAVE_PCAP_FREE_DATALINKS)
else(HAVE_PCAP_LIST_DATALINKS)
# XXX TODO - get our version of pcap_list_datalinks() and pcap_free_datalinks
endif(HAVE_PCAP_LIST_DATALINKS)
check_function_exists(pcap_set_datalink HAVE_PCAP_SET_DATALINK)
#
# Check for "pcap_datalink_name_to_val()", and use a substitute
# version if it's not present. If it is present, check for
# "pcap_datalink_val_to_description()", and if we don't have it,
# use a substitute version.
#
check_function_exists(pcap_datalink_name_to_val HAVE_PCAP_DATALINK_NAME_TO_VAL)
if(HAVE_PCAP_DATALINK_NAME_TO_VAL)
check_function_exists(pcap_datalink_val_to_description HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION)
if(NOT HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION)
# XXX TODO - get our version of pcap_datalink_val_to_description()
endif(NOT HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION)
else(HAVE_PCAP_DATALINK_NAME_TO_VAL)
# XXX TODO - get our version of pcap_datalink_name_to_val() etc.
endif(HAVE_PCAP_DATALINK_NAME_TO_VAL)
#
# Check for "pcap_set_datalink()"; you can't substitute for it if
# it's absent (it has hooks into libpcap), so just define the
# HAVE_ value if it's there.
#
check_function_exists(pcap_set_datalink HAVE_PCAP_SET_DATALINK)
#
# Check for "pcap_breakloop()"; you can't substitute for it if
# it's absent (it has hooks into the live capture routines),
@ -640,6 +655,14 @@ if(NOT HAVE_PCAP_DUMP_FTELL)
set(TCPDUMP_SOURCE_LIST_C ${TCPDUMP_SOURCE_LIST_C} missing/pcap_dump_ftell.c)
endif(NOT HAVE_PCAP_DUMP_FTELL)
if(NOT HAVE_PCAP_LIST_DATALINKS)
set(TCPDUMP_SOURCE_LIST_C ${TCPDUMP_SOURCE_LIST_C} missing/datalinks.c)
endif(NOT HAVE_PCAP_LIST_DATALINKS)
if((NOT HAVE_PCAP_DATALINK_NAME_TO_VAL) OR (NOT HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION))
set(TCPDUMP_SOURCE_LIST_C ${TCPDUMP_SOURCE_LIST_C} missing/dlnames.c)
endif((NOT HAVE_PCAP_DATALINK_NAME_TO_VAL) OR (NOT HAVE_PCAP_DATALINK_VAL_TO_DESCRIPTION))
set(PROJECT_SOURCE_LIST_C ${NETDISSECT_SOURCE_LIST_C} ${TCPDUMP_SOURCE_LIST_C})
file(GLOB PROJECT_SOURCE_LIST_H

15
configure.ac
View File

@ -567,8 +567,13 @@ don't.])
fi
dnl
dnl Check for "pcap_list_datalinks()" and use a substitute version
dnl if it's not present.
dnl Check for "pcap_list_datalinks()" and use a substitute version if
dnl it's not present. If it is present, check for "pcap_free_datalinks()";
dnl if it's not present, we don't replace it for now. (We could do so
dnl on UN*X, but not on Windows, where hilarity ensues if a program
dnl built with one version of the MSVC support library tries to free
dnl something allocated by a library built with another version of
dnl the MSVC support library.)
dnl
AC_CHECK_FUNC(pcap_list_datalinks,
[
@ -581,8 +586,10 @@ AC_CHECK_FUNC(pcap_list_datalinks,
])
dnl
dnl Check for "pcap_datalink_name_to_val()", and use a substitute version
dnl if it's not present.
dnl Check for "pcap_datalink_name_to_val()", and use a substitute
dnl version if it's not present. If it is present, check for
dnl "pcap_datalink_val_to_description()", and if we don't have it,
dnl use a substitute version.
dnl
AC_CHECK_FUNC(pcap_datalink_name_to_val,
[