[asterisk-commits] kpfleming: branch 1.6.0 r130041 - in /branches/1.6.0: ./ channels/ configs/ i...

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Fri Jul 11 11:05:02 2008
New Revision: 130041

URL: http://svn.digium.com/view/asterisk?view=rev&rev=130041
Log:
Merged revisions 130040 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r130040 | kpfleming | 2008-07-11 10:57:17 -0500 (Fri, 11 Jul 2008) | 12 lines

Merged revisions 130039 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r130039 | kpfleming | 2008-07-11 10:41:56 -0500 (Fri, 11 Jul 2008) | 4 lines

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.6.0/   (props changed)
    branches/1.6.0/channels/chan_dahdi.c
    branches/1.6.0/configs/chan_dahdi.conf.sample
    branches/1.6.0/configure
    branches/1.6.0/configure.ac
    branches/1.6.0/include/asterisk/autoconfig.h.in

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_dahdi.c?view=diff&rev=130041&r1=130040&r2=130041
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Fri Jul 11 11:05:02 2008
@@ -413,6 +413,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 */
 	int sig;
@@ -8289,6 +8292,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));
@@ -11322,6 +11328,9 @@
 		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);
+#endif
 		/* Enslave to master if appropriate */
 		if (i)
 			pri_enslave(pri->dchans[0], pri->dchans[i]);
@@ -14076,6 +14085,10 @@
 				} else {
 					confp->pri.overlapdial = DAHDI_OVERLAPDIAL_NONE;
 				}
+#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 tmp[20], *timerc, *c = tmp;

Modified: branches/1.6.0/configs/chan_dahdi.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configs/chan_dahdi.conf.sample?view=diff&rev=130041&r1=130040&r2=130041
==============================================================================
--- branches/1.6.0/configs/chan_dahdi.conf.sample (original)
+++ branches/1.6.0/configs/chan_dahdi.conf.sample Fri Jul 11 11:05:02 2008
@@ -161,6 +161,10 @@
 ; Cannot be changed on a reload.
 ;
 ;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.6.0/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configure.ac?view=diff&rev=130041&r1=130040&r2=130041
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Fri Jul 11 11:05:02 2008
@@ -1292,6 +1292,8 @@
 
 AST_EXT_LIB_CHECK([PRI], [pri], [pri_new_bri], [libpri.h])
 
+AST_EXT_LIB_CHECK([PRI_INBANDRELEASE], [pri], [pri_set_inbandrelease], [libpri.h])
+
 AST_C_COMPILE_CHECK([SPANDSP], [
 		#if SPANDSP_RELEASE_DATE < 20080516
 		#error "spandsp 0.0.5 or greater is required"

Modified: branches/1.6.0/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/autoconfig.h.in?view=diff&rev=130041&r1=130040&r2=130041
==============================================================================
--- branches/1.6.0/include/asterisk/autoconfig.h.in (original)
+++ branches/1.6.0/include/asterisk/autoconfig.h.in Fri Jul 11 11:05:02 2008
@@ -588,6 +588,12 @@
 
 /* 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 to indicate the ${PRI_INBANDRELEASE_DESCRIP} library version */
+#undef HAVE_PRI_INBANDRELEASE_VERSION
 
 /* Define to indicate the ${PRI_DESCRIP} library version */
 #undef HAVE_PRI_VERSION