[svn-commits] kpfleming: branch 1.4 r132641 - in /branches/1.4: ./ channels/ configs/ inclu...

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Tue Jul 22 14:49:11 2008
New Revision: 132641

URL: http://svn.digium.com/view/asterisk?view=rev&rev=132641
Log:
use renamed libpri API call for controlling this feature (was improperly named before)

Modified:
    branches/1.4/channels/chan_dahdi.c
    branches/1.4/configs/chan_dahdi.conf.sample
    branches/1.4/configure
    branches/1.4/configure.ac
    branches/1.4/include/asterisk/autoconfig.h.in

Modified: branches/1.4/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_dahdi.c?view=diff&rev=132641&r1=132640&r2=132641
==============================================================================
--- branches/1.4/channels/chan_dahdi.c (original)
+++ branches/1.4/channels/chan_dahdi.c Tue Jul 22 14:49:11 2008
@@ -325,8 +325,8 @@
 	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 @@
 						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 @@
 		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 @@
 				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

Modified: branches/1.4/configs/chan_dahdi.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.4/configs/chan_dahdi.conf.sample?view=diff&rev=132641&r1=132640&r2=132641
==============================================================================
--- branches/1.4/configs/chan_dahdi.conf.sample (original)
+++ branches/1.4/configs/chan_dahdi.conf.sample Tue Jul 22 14:49:11 2008
@@ -118,7 +118,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

Modified: branches/1.4/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure.ac?view=diff&rev=132641&r1=132640&r2=132641
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Tue Jul 22 14:49:11 2008
@@ -1245,7 +1245,7 @@
 
 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

Modified: branches/1.4/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/autoconfig.h.in?view=diff&rev=132641&r1=132640&r2=132641
==============================================================================
--- branches/1.4/include/asterisk/autoconfig.h.in (original)
+++ branches/1.4/include/asterisk/autoconfig.h.in Tue Jul 22 14:49:11 2008
@@ -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