generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check if getaddrinfo is threadsafe when function check allows it to be used

Browse Source
This commit is contained in:
Yang Tse 2009-11-12 18:31:33 +00:00
parent 011a2818db
commit c1f9440aca
2 changed files with 90 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ares/m4/cares-functions.m4
View File

@ -16,7 +16,7 @@
#*************************************************************************** #***************************************************************************
# File version for 'aclocal' use. Keep it a single number. # File version for 'aclocal' use. Keep it a single number.
# serial 32 # serial 33
dnl CARES_INCLUDES_ARPA_INET dnl CARES_INCLUDES_ARPA_INET
@ -873,7 +873,10 @@ dnl Verify if getaddrinfo is available, prototyped, can
dnl be compiled and seems to work. If all of these are dnl be compiled and seems to work. If all of these are
dnl true, and usage has not been previously disallowed dnl true, and usage has not been previously disallowed
dnl with shell variable cares_disallow_getaddrinfo, then dnl with shell variable cares_disallow_getaddrinfo, then
dnl HAVE_GETADDRINFO will be defined. dnl HAVE_GETADDRINFO will be defined. Additionally when
dnl HAVE_GETADDRINFO gets defined this will also attempt
dnl to find out if getaddrinfo happens to be threadsafe,
dnl defining HAVE_GETADDRINFO_THREADSAFE when true.
AC_DEFUN([CARES_CHECK_FUNC_GETADDRINFO], [ AC_DEFUN([CARES_CHECK_FUNC_GETADDRINFO], [
AC_REQUIRE([CARES_INCLUDES_WS2TCPIP])dnl AC_REQUIRE([CARES_INCLUDES_WS2TCPIP])dnl
@ -887,6 +890,7 @@ AC_DEFUN([CARES_CHECK_FUNC_GETADDRINFO], [
tst_compi_getaddrinfo="unknown" tst_compi_getaddrinfo="unknown"
tst_works_getaddrinfo="unknown" tst_works_getaddrinfo="unknown"
tst_allow_getaddrinfo="unknown" tst_allow_getaddrinfo="unknown"
tst_tsafe_getaddrinfo="unknown"
# #
AC_MSG_CHECKING([if getaddrinfo can be linked]) AC_MSG_CHECKING([if getaddrinfo can be linked])
AC_LINK_IFELSE([ AC_LINK_IFELSE([
@ -1001,6 +1005,45 @@ AC_DEFUN([CARES_CHECK_FUNC_GETADDRINFO], [
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
ac_cv_func_getaddrinfo="no" ac_cv_func_getaddrinfo="no"
ac_cv_func_getaddrinfo_threadsafe="no"
fi
#
if test "$ac_cv_func_getaddrinfo" = "yes"; then
AC_MSG_CHECKING([if getaddrinfo is threadsafe])
case $host_os in
darwin[[12354678]].*)
tst_tsafe_getaddrinfo="no"
;;
darwin*)
tst_tsafe_getaddrinfo="yes"
;;
dragonflybsd*)
tst_tsafe_getaddrinfo="yes"
;;
freebsd[[1234]].* | freebsd5.[[1234]]*)
tst_tsafe_getaddrinfo="no"
;;
freebsd*)
tst_tsafe_getaddrinfo="yes"
;;
linux*)
tst_tsafe_getaddrinfo="yes"
;;
netbsd[[123]].*)
tst_tsafe_getaddrinfo="no"
;;
netbsd*)
tst_tsafe_getaddrinfo="yes"
;;
esac
AC_MSG_RESULT([$tst_tsafe_getaddrinfo])
if test "$tst_tsafe_getaddrinfo" = "yes"; then
AC_DEFINE_UNQUOTED(HAVE_GETADDRINFO_THREADSAFE, 1,
[Define to 1 if the getaddrinfo function is threadsafe.])
ac_cv_func_getaddrinfo_threadsafe="yes"
else
ac_cv_func_getaddrinfo_threadsafe="no"
fi
fi fi
]) ])

47
m4/curl-functions.m4
View File

@ -22,7 +22,7 @@
#*************************************************************************** #***************************************************************************
# File version for 'aclocal' use. Keep it a single number. # File version for 'aclocal' use. Keep it a single number.
# serial 54 # serial 55
dnl CURL_INCLUDES_ARPA_INET dnl CURL_INCLUDES_ARPA_INET
@ -1497,7 +1497,10 @@ dnl Verify if getaddrinfo is available, prototyped, can
dnl be compiled and seems to work. If all of these are dnl be compiled and seems to work. If all of these are
dnl true, and usage has not been previously disallowed dnl true, and usage has not been previously disallowed
dnl with shell variable curl_disallow_getaddrinfo, then dnl with shell variable curl_disallow_getaddrinfo, then
dnl HAVE_GETADDRINFO will be defined. dnl HAVE_GETADDRINFO will be defined. Additionally when
dnl HAVE_GETADDRINFO gets defined this will also attempt
dnl to find out if getaddrinfo happens to be threadsafe,
dnl defining HAVE_GETADDRINFO_THREADSAFE when true.
AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [
AC_REQUIRE([CURL_INCLUDES_WS2TCPIP])dnl AC_REQUIRE([CURL_INCLUDES_WS2TCPIP])dnl
@ -1511,6 +1514,7 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [
tst_compi_getaddrinfo="unknown" tst_compi_getaddrinfo="unknown"
tst_works_getaddrinfo="unknown" tst_works_getaddrinfo="unknown"
tst_allow_getaddrinfo="unknown" tst_allow_getaddrinfo="unknown"
tst_tsafe_getaddrinfo="unknown"
# #
AC_MSG_CHECKING([if getaddrinfo can be linked]) AC_MSG_CHECKING([if getaddrinfo can be linked])
AC_LINK_IFELSE([ AC_LINK_IFELSE([
@ -1625,6 +1629,45 @@ AC_DEFUN([CURL_CHECK_FUNC_GETADDRINFO], [
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
ac_cv_func_getaddrinfo="no" ac_cv_func_getaddrinfo="no"
ac_cv_func_getaddrinfo_threadsafe="no"
fi
#
if test "$ac_cv_func_getaddrinfo" = "yes"; then
AC_MSG_CHECKING([if getaddrinfo is threadsafe])
case $host_os in
darwin[[12354678]].*)
tst_tsafe_getaddrinfo="no"
;;
darwin*)
tst_tsafe_getaddrinfo="yes"
;;
dragonflybsd*)
tst_tsafe_getaddrinfo="yes"
;;
freebsd[[1234]].* | freebsd5.[[1234]]*)
tst_tsafe_getaddrinfo="no"
;;
freebsd*)
tst_tsafe_getaddrinfo="yes"
;;
linux*)
tst_tsafe_getaddrinfo="yes"
;;
netbsd[[123]].*)
tst_tsafe_getaddrinfo="no"
;;
netbsd*)
tst_tsafe_getaddrinfo="yes"
;;
esac
AC_MSG_RESULT([$tst_tsafe_getaddrinfo])
if test "$tst_tsafe_getaddrinfo" = "yes"; then
AC_DEFINE_UNQUOTED(HAVE_GETADDRINFO_THREADSAFE, 1,
[Define to 1 if the getaddrinfo function is threadsafe.])
ac_cv_func_getaddrinfo_threadsafe="yes"
else
ac_cv_func_getaddrinfo_threadsafe="no"
fi
fi fi
]) ])