Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Compatibility fix for OpenWRT (reported by Brian Capouch via the mailing list)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@101772 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Tilghman Lesher 18 years ago
parent fe59cfa7aa
commit df1dc7741d
4 changed files with 424 additions and 2 deletions
Show Stats Download Patch File Download Diff File

411
configure vendored
Unescape View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.ac Revision: 98265 .
# From configure.ac Revision: 98951 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.4.
#
@ -17680,6 +17680,415 @@ fi
fi
if test "${USE_GETIFADDRS}" != "no"; then
pbxlibdir=""
if test "x${GETIFADDRS_DIR}" != "x"; then
if test -d ${GETIFADDRS_DIR}/lib; then
pbxlibdir="-L${GETIFADDRS_DIR}/lib"
else
pbxlibdir="-L${GETIFADDRS_DIR}"
fi
fi
{ echo "$as_me:$LINENO: checking for getifaddrs in -lc" >&5
echo $ECHO_N "checking for getifaddrs in -lc... $ECHO_C" >&6; }
if test "${ac_cv_lib_c_getifaddrs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lc ${pbxlibdir} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char getifaddrs ();
int
main ()
{
return getifaddrs ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
ac_cv_lib_c_getifaddrs=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_c_getifaddrs=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_getifaddrs" >&5
echo "${ECHO_T}$ac_cv_lib_c_getifaddrs" >&6; }
if test $ac_cv_lib_c_getifaddrs = yes; then
AST_GETIFADDRS_FOUND=yes
else
AST_GETIFADDRS_FOUND=no
fi
if test "${AST_GETIFADDRS_FOUND}" = "yes"; then
GETIFADDRS_LIB="-lc "
GETIFADDRS_HEADER_FOUND="1"
if test "x${GETIFADDRS_DIR}" != "x"; then
GETIFADDRS_LIB="${pbxlibdir} ${GETIFADDRS_LIB}"
GETIFADDRS_INCLUDE="-I${GETIFADDRS_DIR}/include"
saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} -I${GETIFADDRS_DIR}/include"
if test "xifaddrs.h" != "x" ; then
as_ac_Header=`echo "ac_cv_header_${GETIFADDRS_DIR}/include/ifaddrs.h" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
{ echo "$as_me:$LINENO: checking for ${GETIFADDRS_DIR}/include/ifaddrs.h" >&5
echo $ECHO_N "checking for ${GETIFADDRS_DIR}/include/ifaddrs.h... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
ac_res=`eval echo '${'$as_ac_Header'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
else
# Is the header compilable?
{ echo "$as_me:$LINENO: checking ${GETIFADDRS_DIR}/include/ifaddrs.h usability" >&5
echo $ECHO_N "checking ${GETIFADDRS_DIR}/include/ifaddrs.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
#include <${GETIFADDRS_DIR}/include/ifaddrs.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
{ echo "$as_me:$LINENO: checking ${GETIFADDRS_DIR}/include/ifaddrs.h presence" >&5
echo $ECHO_N "checking ${GETIFADDRS_DIR}/include/ifaddrs.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <${GETIFADDRS_DIR}/include/ifaddrs.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
{ echo "$as_me:$LINENO: WARNING: ${GETIFADDRS_DIR}/include/ifaddrs.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: ${GETIFADDRS_DIR}/include/ifaddrs.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: ${GETIFADDRS_DIR}/include/ifaddrs.h: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: ${GETIFADDRS_DIR}/include/ifaddrs.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ echo "$as_me:$LINENO: WARNING: ${GETIFADDRS_DIR}/include/ifaddrs.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: ${GETIFADDRS_DIR}/include/ifaddrs.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: ${GETIFADDRS_DIR}/include/ifaddrs.h: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: ${GETIFADDRS_DIR}/include/ifaddrs.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: ${GETIFADDRS_DIR}/include/ifaddrs.h: see the Autoconf documentation" >&5
echo "$as_me: WARNING: ${GETIFADDRS_DIR}/include/ifaddrs.h: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: ${GETIFADDRS_DIR}/include/ifaddrs.h: section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: ${GETIFADDRS_DIR}/include/ifaddrs.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: ${GETIFADDRS_DIR}/include/ifaddrs.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: ${GETIFADDRS_DIR}/include/ifaddrs.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: ${GETIFADDRS_DIR}/include/ifaddrs.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: ${GETIFADDRS_DIR}/include/ifaddrs.h: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## ------------------------------- ##
## Report this to www.asterisk.org ##
## ------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for ${GETIFADDRS_DIR}/include/ifaddrs.h" >&5
echo $ECHO_N "checking for ${GETIFADDRS_DIR}/include/ifaddrs.h... $ECHO_C" >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
ac_res=`eval echo '${'$as_ac_Header'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
GETIFADDRS_HEADER_FOUND=1
else
GETIFADDRS_HEADER_FOUND=0
fi
fi
CPPFLAGS="${saved_cppflags}"
else
if test "xifaddrs.h" != "x" ; then
if test "${ac_cv_header_ifaddrs_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for ifaddrs.h" >&5
echo $ECHO_N "checking for ifaddrs.h... $ECHO_C" >&6; }
if test "${ac_cv_header_ifaddrs_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_ifaddrs_h" >&5
echo "${ECHO_T}$ac_cv_header_ifaddrs_h" >&6; }
else
# Is the header compilable?
{ echo "$as_me:$LINENO: checking ifaddrs.h usability" >&5
echo $ECHO_N "checking ifaddrs.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
#include <ifaddrs.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
{ echo "$as_me:$LINENO: checking ifaddrs.h presence" >&5
echo $ECHO_N "checking ifaddrs.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ifaddrs.h>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
{ echo "$as_me:$LINENO: WARNING: ifaddrs.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: ifaddrs.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: ifaddrs.h: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: ifaddrs.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ echo "$as_me:$LINENO: WARNING: ifaddrs.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: ifaddrs.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: ifaddrs.h: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: ifaddrs.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: ifaddrs.h: see the Autoconf documentation" >&5
echo "$as_me: WARNING: ifaddrs.h: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: ifaddrs.h: section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: ifaddrs.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: ifaddrs.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: ifaddrs.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: ifaddrs.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: ifaddrs.h: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## ------------------------------- ##
## Report this to www.asterisk.org ##
## ------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ echo "$as_me:$LINENO: checking for ifaddrs.h" >&5
echo $ECHO_N "checking for ifaddrs.h... $ECHO_C" >&6; }
if test "${ac_cv_header_ifaddrs_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_ifaddrs_h=$ac_header_preproc
fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_ifaddrs_h" >&5
echo "${ECHO_T}$ac_cv_header_ifaddrs_h" >&6; }
fi
if test $ac_cv_header_ifaddrs_h = yes; then
GETIFADDRS_HEADER_FOUND=1
else
GETIFADDRS_HEADER_FOUND=0
fi
fi
fi
if test "x${GETIFADDRS_HEADER_FOUND}" = "x0" ; then
if test -n "${GETIFADDRS_MANDATORY}" ;
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
{ echo "$as_me:$LINENO: *** It appears that you do not have the c development package installed." >&5
echo "$as_me: *** It appears that you do not have the c development package installed." >&6;}
{ echo "$as_me:$LINENO: *** Please install it to include ${GETIFADDRS_DESCRIP} support, or re-run configure" >&5
echo "$as_me: *** Please install it to include ${GETIFADDRS_DESCRIP} support, or re-run configure" >&6;}
{ echo "$as_me:$LINENO: *** without explicitly specifying --with-${GETIFADDRS_OPTION}" >&5
echo "$as_me: *** without explicitly specifying --with-${GETIFADDRS_OPTION}" >&6;}
exit 1
fi
GETIFADDRS_LIB=""
GETIFADDRS_INCLUDE=""
PBX_GETIFADDRS=0
else
PBX_GETIFADDRS=1
cat >>confdefs.h <<_ACEOF
#define HAVE_GETIFADDRS 1
_ACEOF
fi
elif test -n "${GETIFADDRS_MANDATORY}";
then
{ echo "$as_me:$LINENO: ***" >&5
echo "$as_me: ***" >&6;}
{ echo "$as_me:$LINENO: *** The ${GETIFADDRS_DESCRIP} installation on this system appears to be broken." >&5
echo "$as_me: *** The ${GETIFADDRS_DESCRIP} installation on this system appears to be broken." >&6;}
{ echo "$as_me:$LINENO: *** Either correct the installation, or run configure" >&5
echo "$as_me: *** Either correct the installation, or run configure" >&6;}
{ echo "$as_me:$LINENO: *** without explicitly specifying --with-${GETIFADDRS_OPTION}" >&5
echo "$as_me: *** without explicitly specifying --with-${GETIFADDRS_OPTION}" >&6;}
exit 1
fi
fi
GSM_INTERNAL="yes"
GSM_SYSTEM="yes"

2
configure.ac
Unescape View File

@ -404,6 +404,8 @@ if test "x${host_os}" = "xlinux-gnu" ; then
AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h])
fi
AST_EXT_LIB_CHECK([GETIFADDRS], [c], [getifaddrs], [ifaddrs.h])
GSM_INTERNAL="yes"
AC_SUBST(GSM_INTERNAL)
GSM_SYSTEM="yes"

3
include/asterisk/autoconfig.h.in
Unescape View File

@ -123,6 +123,9 @@
/* Define to 1 if you have the `gethostname' function. */
#undef HAVE_GETHOSTNAME
/* Define to indicate the ${GETIFADDRS_DESCRIP} library */
#undef HAVE_GETIFADDRS
/* Define to 1 if you have the `getloadavg' function. */
#undef HAVE_GETLOADAVG

10
main/acl.c
Unescape View File

@ -51,7 +51,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#if defined(SOLARIS)
#include <sys/sockio.h>
#include <net/if.h>
#else
#elif defined(HAVE_GETIFADDRS)
#include <ifaddrs.h>
#endif
@ -88,6 +88,12 @@ struct my_ifreq {
struct sockaddr_in ifru_addr;
};
#if (!defined(SOLARIS) && !defined(HAVE_GETIFADDRS))
static int get_local_address(struct in_addr *ourip)
{
return -1;
}
#else
static void score_address(const struct sockaddr_in *sin, struct in_addr *best_addr, int *best_score)
{
const char *address;
@ -241,6 +247,8 @@ static int get_local_address(struct in_addr *ourip)
memcpy(ourip, &best_addr, sizeof(*ourip));
return res;
}
#endif /* HAVE_GETIFADDRS */
/* Free HA structure */
void ast_free_ha(struct ast_ha *ha)
{

Write Preview
Loading…
Cancel
Save