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

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Fri Jul 11 10:41:56 2008
New Revision: 130039

URL: http://svn.digium.com/view/asterisk?view=rev&rev=130039
Log:
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)

Modified:
    branches/1.4/channels/chan_dahdi.c
    branches/1.4/configs/zapata.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=130039&r1=130038&r2=130039
==============================================================================
--- branches/1.4/channels/chan_dahdi.c (original)
+++ branches/1.4/channels/chan_dahdi.c Fri Jul 11 10:41:56 2008
@@ -331,6 +331,9 @@
 	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 @@
 						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 @@
 		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 @@
 				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;

Modified: branches/1.4/configs/zapata.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.4/configs/zapata.conf.sample?view=diff&rev=130039&r1=130038&r2=130039
==============================================================================
--- branches/1.4/configs/zapata.conf.sample (original)
+++ branches/1.4/configs/zapata.conf.sample Fri Jul 11 10:41:56 2008
@@ -115,6 +115,10 @@
 ; Overlap dialing mode (sending overlap digits)
 ;
 ;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

Modified: branches/1.4/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.4/configure.ac?view=diff&rev=130039&r1=130038&r2=130039
==============================================================================
--- branches/1.4/configure.ac (original)
+++ branches/1.4/configure.ac Fri Jul 11 10:41:56 2008
@@ -1245,6 +1245,8 @@
 
 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}"

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=130039&r1=130038&r2=130039
==============================================================================
--- branches/1.4/include/asterisk/autoconfig.h.in (original)
+++ branches/1.4/include/asterisk/autoconfig.h.in Fri Jul 11 10:41:56 2008
@@ -285,6 +285,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