diff options
| -rw-r--r-- | channels/chan_dahdi.c | 18 | ||||
| -rw-r--r-- | configs/chan_dahdi.conf.sample | 2 | ||||
| -rwxr-xr-x | configure | 88 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 4 |
5 files changed, 57 insertions, 57 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index c1c75da64..6210a8f24 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -325,8 +325,8 @@ 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? */ +#ifdef HAVE_PRI_INBANDDISCONNECT + unsigned int inbanddisconnect: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 */ @@ -7382,8 +7382,8 @@ 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; +#ifdef HAVE_PRI_INBANDDISCONNECT + pris[span].inbanddisconnect = conf->pri.inbandrelease; #endif pris[span].facilityenable = conf->pri.facilityenable; ast_copy_string(pris[span].idledial, conf->pri.idledial, sizeof(pris[span].idledial)); @@ -9569,8 +9569,8 @@ 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); +#ifdef HAVE_PRI_INBANDDISCONNECT + pri_set_inbanddisconnect(pri->dchans[i], pri->inbandrelease); #endif /* Enslave to master if appropriate */ if (i) @@ -11203,9 +11203,9 @@ 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); +#ifdef HAVE_PRI_INBANDDISCONNECT + } else if (!strcasecmp(v->name, "inbanddisconnect")) { + confp->pri.inbanddisconnect = ast_true(v->value); #endif } else if (!strcasecmp(v->name, "pritimer")) { #ifdef PRI_GETSET_TIMERS diff --git a/configs/chan_dahdi.conf.sample b/configs/chan_dahdi.conf.sample index 70bc8a208..68503f440 100644 --- a/configs/chan_dahdi.conf.sample +++ b/configs/chan_dahdi.conf.sample @@ -118,7 +118,7 @@ switchtype=national ; ; Allow inband audio (progress) when a call is RELEASEd by the far end of a PRI ; -;inbandrelease=yes +;inbanddisconnect=yes ; ; PRI Out of band indications. ; Enable this to report Busy and Congestion on a PRI using out-of-band @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 128637 . +# From configure.ac Revision: 130039 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.4. # @@ -24162,18 +24162,18 @@ fi -if test "${USE_PRI_INBANDRELEASE}" != "no"; then +if test "${USE_PRI_INBANDDISCONNECT}" != "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" + if test "x${PRI_INBANDDISCONNECT_DIR}" != "x"; then + if test -d ${PRI_INBANDDISCONNECT_DIR}/lib; then + pbxlibdir="-L${PRI_INBANDDISCONNECT_DIR}/lib" else - pbxlibdir="-L${PRI_INBANDRELEASE_DIR}" + pbxlibdir="-L${PRI_INBANDDISCONNECT_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 "$as_me:$LINENO: checking for pri_set_inbanddisconnect in -lpri" >&5 +echo $ECHO_N "checking for pri_set_inbanddisconnect in -lpri... $ECHO_C" >&6; } +if test "${ac_cv_lib_pri_pri_set_inbanddisconnect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -24191,11 +24191,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char pri_set_inbandrelease (); +char pri_set_inbanddisconnect (); int main () { -return pri_set_inbandrelease (); +return pri_set_inbanddisconnect (); ; return 0; } @@ -24218,37 +24218,37 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_pri_pri_set_inbandrelease=yes + ac_cv_lib_pri_pri_set_inbanddisconnect=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_pri_pri_set_inbandrelease=no + ac_cv_lib_pri_pri_set_inbanddisconnect=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 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_pri_pri_set_inbanddisconnect" >&5 +echo "${ECHO_T}$ac_cv_lib_pri_pri_set_inbanddisconnect" >&6; } +if test $ac_cv_lib_pri_pri_set_inbanddisconnect = yes; then + AST_PRI_INBANDDISCONNECT_FOUND=yes else - AST_PRI_INBANDRELEASE_FOUND=no + AST_PRI_INBANDDISCONNECT_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" + if test "${AST_PRI_INBANDDISCONNECT_FOUND}" = "yes"; then + PRI_INBANDDISCONNECT_LIB="-lpri " + PRI_INBANDDISCONNECT_HEADER_FOUND="1" + if test "x${PRI_INBANDDISCONNECT_DIR}" != "x"; then + PRI_INBANDDISCONNECT_LIB="${pbxlibdir} ${PRI_INBANDDISCONNECT_LIB}" + PRI_INBANDDISCONNECT_INCLUDE="-I${PRI_INBANDDISCONNECT_DIR}/include" fi - PRI_INBANDRELEASE_INCLUDE="${PRI_INBANDRELEASE_INCLUDE} " + PRI_INBANDDISCONNECT_INCLUDE="${PRI_INBANDDISCONNECT_INCLUDE} " saved_cppflags="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${PRI_INBANDRELEASE_INCLUDE}" + CPPFLAGS="${CPPFLAGS} ${PRI_INBANDDISCONNECT_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 @@ -24381,48 +24381,48 @@ echo "${ECHO_T}$ac_cv_header_libpri_h" >&6; } fi if test $ac_cv_header_libpri_h = yes; then - PRI_INBANDRELEASE_HEADER_FOUND=1 + PRI_INBANDDISCONNECT_HEADER_FOUND=1 else - PRI_INBANDRELEASE_HEADER_FOUND=0 + PRI_INBANDDISCONNECT_HEADER_FOUND=0 fi fi CPPFLAGS="${saved_cppflags}" - if test "x${PRI_INBANDRELEASE_HEADER_FOUND}" = "x0" ; then - if test -n "${PRI_INBANDRELEASE_MANDATORY}" ; + if test "x${PRI_INBANDDISCONNECT_HEADER_FOUND}" = "x0" ; then + if test -n "${PRI_INBANDDISCONNECT_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;} + { echo "$as_me:$LINENO: *** Please install it to include ${PRI_INBANDDISCONNECT_DESCRIP} support, or re-run configure" >&5 +echo "$as_me: *** Please install it to include ${PRI_INBANDDISCONNECT_DESCRIP} support, or re-run configure" >&6;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_INBANDDISCONNECT_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${PRI_INBANDDISCONNECT_OPTION}" >&6;} exit 1 fi - PRI_INBANDRELEASE_LIB="" - PRI_INBANDRELEASE_INCLUDE="" - PBX_PRI_INBANDRELEASE=0 + PRI_INBANDDISCONNECT_LIB="" + PRI_INBANDDISCONNECT_INCLUDE="" + PBX_PRI_INBANDDISCONNECT=0 else - PBX_PRI_INBANDRELEASE=1 + PBX_PRI_INBANDDISCONNECT=1 cat >>confdefs.h <<_ACEOF -#define HAVE_PRI_INBANDRELEASE 1 +#define HAVE_PRI_INBANDDISCONNECT 1 _ACEOF fi - elif test -n "${PRI_INBANDRELEASE_MANDATORY}"; + elif test -n "${PRI_INBANDDISCONNECT_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: *** The ${PRI_INBANDDISCONNECT_DESCRIP} installation on this system appears to be broken." >&5 +echo "$as_me: *** The ${PRI_INBANDDISCONNECT_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;} + { echo "$as_me:$LINENO: *** without explicitly specifying --with-${PRI_INBANDDISCONNECT_OPTION}" >&5 +echo "$as_me: *** without explicitly specifying --with-${PRI_INBANDDISCONNECT_OPTION}" >&6;} exit 1 fi fi diff --git a/configure.ac b/configure.ac index 4f05eb200..7496ec05a 100644 --- a/configure.ac +++ b/configure.ac @@ -1245,7 +1245,7 @@ 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]) +AST_EXT_LIB_CHECK([PRI_INBANDDISCONNECT], [pri], [pri_set_inbanddisconnect], [libpri.h]) if test "${USE_PWLIB}" != "no"; then if test -n "${PWLIB_DIR}"; then diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index e7ab2e90f..d662bc79f 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -286,8 +286,8 @@ /* 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_INBANDDISCONNECT_DESCRIP} library */ +#undef HAVE_PRI_INBANDDISCONNECT /* Define to indicate the ${PRI_VERSION_DESCRIP} library */ #undef HAVE_PRI_VERSION |