diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-11 15:41:56 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-11 15:41:56 +0000 |
commit | f415f172cfef137d01b36ebc1e3cb37d42835ef9 (patch) | |
tree | 7b037d15ca7bd30c92987c59025aa05158b9eb21 | |
parent | c8b288e42f31767e33b46dbfa7c0de10b8a7ce86 (diff) |
add support for a configuration parameter for 'inband audio during RELEASE', which is currently mandatory in libpri-1.4.4 but will become configurable in libpri-1.4.5 later today
(related to issue #13042)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@130039 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_dahdi.c | 13 | ||||
-rw-r--r-- | configs/zapata.conf.sample | 4 | ||||
-rwxr-xr-x | configure | 269 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | include/asterisk/autoconfig.h.in | 3 |
5 files changed, 290 insertions, 1 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index aab01c511..e9c99c4eb 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -331,6 +331,9 @@ struct dahdi_pri { int span; int resetting; int resetpos; +#ifdef HAVE_PRI_INBANDRELEASE + unsigned int inbandrelease:1; /*!< Should we support inband audio after receiving RELEASE? */ +#endif time_t lastreset; /*!< time when unused channels were last reset */ long resetinterval; /*!< Interval (in seconds) for resetting unused channels */ struct dahdi_pvt *pvts[MAX_CHANNELS]; /*!< Member channel pvt structs */ @@ -7348,6 +7351,9 @@ static struct dahdi_pvt *mkintf(int channel, const struct dahdi_chan_conf *conf, pris[span].minunused = conf->pri.minunused; pris[span].minidle = conf->pri.minidle; pris[span].overlapdial = conf->pri.overlapdial; +#ifdef HAVE_PRI_INBANDRELEASE + pris[span].inbandrelease = conf->pri.inbandrelease; +#endif pris[span].facilityenable = conf->pri.facilityenable; ast_copy_string(pris[span].idledial, conf->pri.idledial, sizeof(pris[span].idledial)); ast_copy_string(pris[span].idleext, conf->pri.idleext, sizeof(pris[span].idleext)); @@ -9534,6 +9540,9 @@ static int start_pri(struct dahdi_pri *pri) if (pri->switchtype == PRI_SWITCH_GR303_TMC) pri->overlapdial = 1; pri_set_overlapdial(pri->dchans[i],pri->overlapdial); +#ifdef HAVE_PRI_INBANDRELEASE + pri_set_inbandrelease(pri->dchans[i], pri->inbandrelease); +#endif /* Enslave to master if appropriate */ if (i) pri_enslave(pri->dchans[0], pri->dchans[i]); @@ -11153,6 +11162,10 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct ast_copy_string(confp->pri.idledial, v->value, sizeof(confp->pri.idledial)); } else if (!strcasecmp(v->name, "overlapdial")) { confp->pri.overlapdial = ast_true(v->value); +#ifdef HAVE_PRI_INBANDRELEASE + } else if (!strcasecmp(v->name, "inbandrelease")) { + confp->pri.inbandrelease = ast_true(v->value); +#endif } else if (!strcasecmp(v->name, "pritimer")) { #ifdef PRI_GETSET_TIMERS char *timerc, *c; diff --git a/configs/zapata.conf.sample b/configs/zapata.conf.sample index 3bdb8337f..21a2d6000 100644 --- a/configs/zapata.conf.sample +++ b/configs/zapata.conf.sample @@ -116,6 +116,10 @@ switchtype=national ; ;overlapdial=yes ; +; Allow inband audio (progress) when a call is RELEASEd by the far end of a PRI +; +;inbandrelease=yes +; ; PRI Out of band indications. ; Enable this to report Busy and Congestion on a PRI using out-of-band ; notification. Inband indication, as used by Asterisk doesn't seem to work @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 127754 . +# From configure.ac Revision: 128637 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.4. # @@ -24161,6 +24161,273 @@ echo "$as_me: *** without explicitly specifying --with-${PRI_VERSION_OPTION}" >& fi + +if test "${USE_PRI_INBANDRELEASE}" != "no"; then + pbxlibdir="" + if test "x${PRI_INBANDRELEASE_DIR}" != "x"; then + if test -d ${PRI_INBANDRELEASE_DIR}/lib; then + pbxlibdir="-L${PRI_INBANDRELEASE_DIR}/lib" + else + pbxlibdir="-L${PRI_INBANDRELEASE_DIR}" + fi + fi + { echo "$as_me:$LINENO: checking for pri_set_inbandrelease in -lpri" >&5 +echo $ECHO_N "checking for pri_set_inbandrelease in -lpri... $ECHO_C" >&6; } +if test "${ac_cv_lib_pri_pri_set_inbandrelease+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpri ${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 pri_set_inbandrelease (); +int +main () +{ +return pri_set_inbandrelease (); + ; + 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_pri_pri_set_inbandrelease=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_pri_pri_set_inbandrelease=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_pri_pri_set_inbandrelease" >&5 +echo "${ECHO_T}$ac_cv_lib_pri_pri_set_inbandrelease" >&6; } +if test $ac_cv_lib_pri_pri_set_inbandrelease = yes; then + AST_PRI_INBANDRELEASE_FOUND=yes +else + AST_PRI_INBANDRELEASE_FOUND=no +fi + + + if test "${AST_PRI_INBANDRELEASE_FOUND}" = "yes"; then + PRI_INBANDRELEASE_LIB="-lpri " + PRI_INBANDRELEASE_HEADER_FOUND="1" + if test "x${PRI_INBANDRELEASE_DIR}" != "x"; then + PRI_INBANDRELEASE_LIB="${pbxlibdir} ${PRI_INBANDRELEASE_LIB}" + PRI_INBANDRELEASE_INCLUDE="-I${PRI_INBANDRELEASE_DIR}/include" + fi + PRI_INBANDRELEASE_INCLUDE="${PRI_INBANDRELEASE_INCLUDE} " + saved_cppflags="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} ${PRI_INBANDRELEASE_INCLUDE}" + if test "xlibpri.h" != "x" ; then + if test "${ac_cv_header_libpri_h+set}" = set; then + { echo "$as_me:$LINENO: checking for libpri.h" >&5 +echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; } +if test "${ac_cv_header_libpri_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5 +echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking libpri.h usability" >&5 +echo $ECHO_N "checking libpri.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 <libpri.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 libpri.h presence" >&5 +echo $ECHO_N "checking libpri.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 <libpri.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: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: libpri.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: libpri.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: libpri.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: libpri.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: libpri.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: libpri.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: libpri.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: libpri.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: libpri.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: libpri.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 libpri.h" >&5 +echo $ECHO_N "checking for libpri.h... $ECHO_C" >&6; } +if test "${ac_cv_header_libpri_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_libpri_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_libpri_h" >&5 +echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; } + +fi +if test $ac_cv_header_libpri_h = yes; then + PRI_INBANDRELEASE_HEADER_FOUND=1 +else + PRI_INBANDRELEASE_HEADER_FOUND=0 +fi + + + fi + CPPFLAGS="${saved_cppflags}" + if test "x${PRI_INBANDRELEASE_HEADER_FOUND}" = "x0" ; then + if test -n "${PRI_INBANDRELEASE_MANDATORY}" ; + then + { echo "$as_me:$LINENO: ***" >&5 +echo "$as_me: ***" >&6;} + { echo "$as_me:$LINENO: *** It appears that you do not have the pri development package installed." >&5 +echo "$as_me: *** It appears that you do not have the pri development package installed." >&6;} + { echo "$as_me:$LINENO: *** Please install it to include ${PRI_INBANDRELEASE_DESCRIP} support, or re-run configure" >&5 +echo "$as_me: *** Please install it to include ${PRI_INBANDRELEASE_DESCRIP} support, or re-run configure" >&6;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_INBANDRELEASE_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${PRI_INBANDRELEASE_OPTION}" >&6;} + exit 1 + fi + PRI_INBANDRELEASE_LIB="" + PRI_INBANDRELEASE_INCLUDE="" + PBX_PRI_INBANDRELEASE=0 + else + PBX_PRI_INBANDRELEASE=1 + +cat >>confdefs.h <<_ACEOF +#define HAVE_PRI_INBANDRELEASE 1 +_ACEOF + + fi + elif test -n "${PRI_INBANDRELEASE_MANDATORY}"; + then + { echo "$as_me:$LINENO: ***" >&5 +echo "$as_me: ***" >&6;} + { echo "$as_me:$LINENO: *** The ${PRI_INBANDRELEASE_DESCRIP} installation on this system appears to be broken." >&5 +echo "$as_me: *** The ${PRI_INBANDRELEASE_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-${PRI_INBANDRELEASE_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${PRI_INBANDRELEASE_OPTION}" >&6;} + exit 1 + fi +fi + + if test "${USE_PWLIB}" != "no"; then if test -n "${PWLIB_DIR}"; then PWLIBDIR="${PWLIB_DIR}" diff --git a/configure.ac b/configure.ac index ab04ba382..4f05eb200 100644 --- a/configure.ac +++ b/configure.ac @@ -1245,6 +1245,8 @@ AST_EXT_LIB_CHECK([PRI], [pri], [pri_keypad_facility], [libpri.h]) AST_EXT_LIB_CHECK([PRI_VERSION], [pri], [pri_get_version], [libpri.h]) +AST_EXT_LIB_CHECK([PRI_INBANDRELEASE], [pri], [pri_set_inbandrelease], [libpri.h]) + if test "${USE_PWLIB}" != "no"; then if test -n "${PWLIB_DIR}"; then PWLIBDIR="${PWLIB_DIR}" diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 4639e31ac..e7ab2e90f 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -286,6 +286,9 @@ /* Define to indicate the ${PRI_DESCRIP} library */ #undef HAVE_PRI +/* Define to indicate the ${PRI_INBANDRELEASE_DESCRIP} library */ +#undef HAVE_PRI_INBANDRELEASE + /* Define to indicate the ${PRI_VERSION_DESCRIP} library */ #undef HAVE_PRI_VERSION |