diff --git a/CHANGES b/CHANGES index 753f6ae141..6c6eb33f4c 100644 --- a/CHANGES +++ b/CHANGES @@ -12,6 +12,12 @@ --- Functionality changes from Asterisk 13.20.0 to Asterisk 13.21.0 ---------- ------------------------------------------------------------------------------ +Build System +------------------ + * RADIUS backends for CEL and CDR can now also be built using the radcli + client library, in addition to the existing support for building them + using either freeradius or radiusclient-ng. + Core ------------------ * A new configuration option "genericplc_on_equal_codecs" was added to the diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c index 50d0dd0857..f2f07f9df7 100644 --- a/cdr/cdr_radius.c +++ b/cdr/cdr_radius.c @@ -41,11 +41,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") -#ifdef FREERADIUS_CLIENT -#include -#else -#include -#endif +#include RADIUS_HEADER_STR #include "asterisk/channel.h" #include "asterisk/cdr.h" diff --git a/cel/cel_radius.c b/cel/cel_radius.c index 7b418879e8..716e1c3da5 100644 --- a/cel/cel_radius.c +++ b/cel/cel_radius.c @@ -35,11 +35,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Rev$") -#ifdef FREERADIUS_CLIENT -#include -#else -#include -#endif +#include RADIUS_HEADER_STR #include "asterisk/channel.h" #include "asterisk/cel.h" diff --git a/configure b/configure index 8d04169a88..7027f7e373 100755 --- a/configure +++ b/configure @@ -29212,7 +29212,7 @@ fi if test "x${PBX_RADIUS}" = "x1"; then -$as_echo "#define FREERADIUS_CLIENT /**/" >>confdefs.h +$as_echo "#define RADIUS_HEADER_STR " >>confdefs.h else @@ -29311,6 +29311,113 @@ _ACEOF fi + if test "x${PBX_RADIUS}" = "x1"; then + +$as_echo "#define RADIUS_HEADER_STR " >>confdefs.h + + else + +if test "x${PBX_RADIUS}" != "x1" -a "${USE_RADIUS}" != "no"; then + pbxlibdir="" + # if --with-RADIUS=DIR has been specified, use it. + if test "x${RADIUS_DIR}" != "x"; then + if test -d ${RADIUS_DIR}/lib; then + pbxlibdir="-L${RADIUS_DIR}/lib" + else + pbxlibdir="-L${RADIUS_DIR}" + fi + fi + + ast_ext_lib_check_save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} " + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rc_read_config in -lradcli" >&5 +$as_echo_n "checking for rc_read_config in -lradcli... " >&6; } +if ${ac_cv_lib_radcli_rc_read_config+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lradcli ${pbxlibdir} $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* 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 rc_read_config (); +int +main () +{ +return rc_read_config (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_radcli_rc_read_config=yes +else + ac_cv_lib_radcli_rc_read_config=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_radcli_rc_read_config" >&5 +$as_echo "$ac_cv_lib_radcli_rc_read_config" >&6; } +if test "x$ac_cv_lib_radcli_rc_read_config" = xyes; then : + AST_RADIUS_FOUND=yes +else + AST_RADIUS_FOUND=no +fi + + CFLAGS="${ast_ext_lib_check_save_CFLAGS}" + + + # now check for the header. + if test "${AST_RADIUS_FOUND}" = "yes"; then + RADIUS_LIB="${pbxlibdir} -lradcli " + # if --with-RADIUS=DIR has been specified, use it. + if test "x${RADIUS_DIR}" != "x"; then + RADIUS_INCLUDE="-I${RADIUS_DIR}/include" + fi + RADIUS_INCLUDE="${RADIUS_INCLUDE} " + + # check for the header + ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} ${RADIUS_INCLUDE}" + ac_fn_c_check_header_mongrel "$LINENO" "radcli/radcli.h" "ac_cv_header_radcli_radcli_h" "$ac_includes_default" +if test "x$ac_cv_header_radcli_radcli_h" = xyes; then : + RADIUS_HEADER_FOUND=1 +else + RADIUS_HEADER_FOUND=0 +fi + + + CPPFLAGS="${ast_ext_lib_check_saved_CPPFLAGS}" + + if test "x${RADIUS_HEADER_FOUND}" = "x0" ; then + RADIUS_LIB="" + RADIUS_INCLUDE="" + else + + PBX_RADIUS=1 + cat >>confdefs.h <<_ACEOF +#define HAVE_RADIUS 1 +_ACEOF + + fi + fi +fi + + + if test "x${PBX_RADIUS}" = "x1"; then + +$as_echo "#define RADIUS_HEADER_STR " >>confdefs.h + + fi + fi fi diff --git a/configure.ac b/configure.ac index 524a6b33b5..39f15e03a0 100644 --- a/configure.ac +++ b/configure.ac @@ -2379,9 +2379,17 @@ AST_EXT_LIB_CHECK([LUA], [lua], [luaL_newstate], [lua.h], [-lm]) # just different header filenames and different SONAMEs AST_EXT_LIB_CHECK([RADIUS], [freeradius-client], [rc_read_config], [freeradius-client.h]) if test "x${PBX_RADIUS}" = "x1"; then - AC_DEFINE(FREERADIUS_CLIENT, [], [Use the FreeRADIUS-client library]) + AC_DEFINE(RADIUS_HEADER_STR, [], [Name of RADIUS library include header]) else AST_EXT_LIB_CHECK([RADIUS], [radiusclient-ng], [rc_read_config], [radiusclient-ng.h]) + if test "x${PBX_RADIUS}" = "x1"; then + AC_DEFINE(RADIUS_HEADER_STR, [], [Name of RADIUS library include header]) + else + AST_EXT_LIB_CHECK([RADIUS], [radcli], [rc_read_config], [radcli/radcli.h]) + if test "x${PBX_RADIUS}" = "x1"; then + AC_DEFINE(RADIUS_HEADER_STR, [], [Name of RADIUS library include header]) + fi + fi fi AST_EXT_LIB_CHECK([COROSYNC], [cpg], [cpg_join], [corosync/cpg.h], [-lcpg -lcfg]) diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index e5cf7f94ec..0fa2859cb4 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -32,9 +32,6 @@ /* Define to 1 if using `alloca.c'. */ #undef C_ALLOCA -/* Use the FreeRADIUS-client library */ -#undef FREERADIUS_CLIENT - /* Define to 1 if anonymous semaphores work. */ #undef HAS_WORKING_SEMAPHORE @@ -1298,6 +1295,9 @@ /* Define if your system needs braces around PTHREAD_ONCE_INIT */ #undef PTHREAD_ONCE_INIT_NEEDS_BRACES +/* Name of RADIUS library include header */ +#undef RADIUS_HEADER_STR + /* Define to the type of arg 1 for `select'. */ #undef SELECT_TYPE_ARG1