diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 63bf1ee707b7b72c414f38756a7a84fcb2518697..dd7d9b49dac18564e7cfd491f8e1726c0c20ca30 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -416,8 +416,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 DISCONNECT? */
#endif
time_t lastreset; /*!< time when unused channels were last reset */
long resetinterval; /*!< Interval (in seconds) for resetting unused channels */
@@ -8464,8 +8464,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));
@@ -11498,8 +11498,8 @@ static int start_pri(struct dahdi_pri *pri)
if (pri->switchtype == PRI_SWITCH_GR303_TMC)
pri->overlapdial |= DAHDI_OVERLAPDIAL_BOTH;
pri_set_overlapdial(pri->dchans[i],(pri->overlapdial & DAHDI_OVERLAPDIAL_OUTGOING)?1:0);
-#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)
@@ -14342,9 +14342,9 @@ static int process_dahdi(struct dahdi_chan_conf *confp, const char *cat, struct
} else {
confp->pri.overlapdial = DAHDI_OVERLAPDIAL_NONE;
}
-#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 06865616be1e5e1ac4c249512b9a0b4292a2dc80..7b4e72f1e51b444f114152f6a13bd5beeed9b45b 100644
--- a/configs/chan_dahdi.conf.sample
+++ b/configs/chan_dahdi.conf.sample
@@ -164,7 +164,7 @@
;
; 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
diff --git a/configure b/configure
index f2c0b00a7c1ae6ac7f80425ff1d2e9a845a3d6cc..2e86d24a8478a526a674b4cef805109264d021e9 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 130040 .
+# From configure.ac Revision: 132390 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for asterisk 1.6.
#
@@ -39064,19 +39064,19 @@ fi
-if test "x${PBX_PRI_INBANDRELEASE}" != "x1" -a "${USE_PRI_INBANDRELEASE}" != "no"; then
+if test "x${PBX_PRI_INBANDDISCONNECT}" != "x1" -a "${USE_PRI_INBANDDISCONNECT}" != "no"; then
pbxlibdir=""
- # if --with-PRI_INBANDRELEASE=DIR has been specified, use it.
- if test "x${PRI_INBANDRELEASE_DIR}" != "x"; then
- if test -d ${PRI_INBANDRELEASE_DIR}/lib; then
- pbxlibdir="-L${PRI_INBANDRELEASE_DIR}/lib"
+ # if --with-PRI_INBANDDISCONNECT=DIR has been specified, use it.
+ 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
- pbxfuncname="pri_set_inbandrelease"
+ pbxfuncname="pri_set_inbanddisconnect"
if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers
- AST_PRI_INBANDRELEASE_FOUND=yes
+ AST_PRI_INBANDDISCONNECT_FOUND=yes
else
as_ac_Lib=`echo "ac_cv_lib_pri_${pbxfuncname}" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for ${pbxfuncname} in -lpri" >&5
@@ -39142,26 +39142,26 @@ ac_res=`eval echo '${'$as_ac_Lib'}'`
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- AST_PRI_INBANDRELEASE_FOUND=yes
+ AST_PRI_INBANDDISCONNECT_FOUND=yes
else
- AST_PRI_INBANDRELEASE_FOUND=no
+ AST_PRI_INBANDDISCONNECT_FOUND=no
fi
fi
# now check for the header.
- if test "${AST_PRI_INBANDRELEASE_FOUND}" = "yes"; then
- PRI_INBANDRELEASE_LIB="${pbxlibdir} -lpri "
- # if --with-PRI_INBANDRELEASE=DIR has been specified, use it.
- if test "x${PRI_INBANDRELEASE_DIR}" != "x"; then
- PRI_INBANDRELEASE_INCLUDE="-I${PRI_INBANDRELEASE_DIR}/include"
+ if test "${AST_PRI_INBANDDISCONNECT_FOUND}" = "yes"; then
+ PRI_INBANDDISCONNECT_LIB="${pbxlibdir} -lpri "
+ # if --with-PRI_INBANDDISCONNECT=DIR has been specified, use it.
+ if test "x${PRI_INBANDDISCONNECT_DIR}" != "x"; then
+ PRI_INBANDDISCONNECT_INCLUDE="-I${PRI_INBANDDISCONNECT_DIR}/include"
fi
- PRI_INBANDRELEASE_INCLUDE="${PRI_INBANDRELEASE_INCLUDE} "
+ PRI_INBANDDISCONNECT_INCLUDE="${PRI_INBANDDISCONNECT_INCLUDE} "
if test "xlibpri.h" = "x" ; then # no header, assume found
- PRI_INBANDRELEASE_HEADER_FOUND="1"
+ PRI_INBANDDISCONNECT_HEADER_FOUND="1"
else # check for the header
saved_cppflags="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${PRI_INBANDRELEASE_INCLUDE}"
+ CPPFLAGS="${CPPFLAGS} ${PRI_INBANDDISCONNECT_INCLUDE}"
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; }
@@ -39293,31 +39293,31 @@ 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
CPPFLAGS="${saved_cppflags}"
fi
- if test "x${PRI_INBANDRELEASE_HEADER_FOUND}" = "x0" ; then
- PRI_INBANDRELEASE_LIB=""
- PRI_INBANDRELEASE_INCLUDE=""
+ if test "x${PRI_INBANDDISCONNECT_HEADER_FOUND}" = "x0" ; then
+ PRI_INBANDDISCONNECT_LIB=""
+ PRI_INBANDDISCONNECT_INCLUDE=""
else
if test "x${pbxfuncname}" = "x" ; then # only checking headers -> no library
- PRI_INBANDRELEASE_LIB=""
+ PRI_INBANDDISCONNECT_LIB=""
fi
- PBX_PRI_INBANDRELEASE=1
+ PBX_PRI_INBANDDISCONNECT=1
# XXX don't know how to evaluate the description (third argument) in AC_DEFINE_UNQUOTED
cat >>confdefs.h <<_ACEOF
-#define HAVE_PRI_INBANDRELEASE 1
+#define HAVE_PRI_INBANDDISCONNECT 1
_ACEOF
cat >>confdefs.h <<_ACEOF
-#define HAVE_PRI_INBANDRELEASE_VERSION
+#define HAVE_PRI_INBANDDISCONNECT_VERSION
_ACEOF
fi
diff --git a/configure.ac b/configure.ac
index 089aabeb1ab1cf2c1efe7f78c757f3a3bffdbe87..6e9fc7b2b18fbd54d6a07c5d70df2c6a1b019b67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1296,7 +1296,7 @@ AST_EXT_LIB_CHECK([PORTAUDIO], [portaudio], [Pa_GetDeviceCount], [portaudio.h])
AST_EXT_LIB_CHECK([PRI], [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])
AST_EXT_LIB_CHECK([RESAMPLE], [resample], [resample_open], [libresample.h], [-lm])
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index d3245cea4b8ee2a4b9968affcbe039e40247fcae..8f3ff14ac57e7aa78ffb73da207d19f259d7d029 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -602,11 +602,11 @@
/* Define this to indicate the ${PRI_DESCRIP} library */
#undef HAVE_PRI
-/* Define this to indicate the ${PRI_INBANDRELEASE_DESCRIP} library */
-#undef HAVE_PRI_INBANDRELEASE
+/* Define this to indicate the ${PRI_INBANDDISCONNECT_DESCRIP} library */
+#undef HAVE_PRI_INBANDDISCONNECT
-/* Define to indicate the ${PRI_INBANDRELEASE_DESCRIP} library version */
-#undef HAVE_PRI_INBANDRELEASE_VERSION
+/* Define to indicate the ${PRI_INBANDDISCONNECT_DESCRIP} library version */
+#undef HAVE_PRI_INBANDDISCONNECT_VERSION
/* Define to indicate the ${PRI_DESCRIP} library version */
#undef HAVE_PRI_VERSION