[svn-commits] file: trunk r103314 - in /trunk: channels/chan_iax2.c main/channel.c

[SVN commits to the Digium repositories]

Author: file
Date: Mon Feb 11 10:17:15 2008
New Revision: 103314

URL: http://svn.digium.com/view/asterisk?view=rev&rev=103314
Log:
Add support for allowing a native bridge to happen when the L option is enabled. The RTP bridging could already handle this, it just needed to be enabled in the main bridging code.
(issue #10647)
Reported by: samdell3

Modified:
    trunk/channels/chan_iax2.c
    trunk/main/channel.c

Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=103314&r1=103313&r2=103314
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Mon Feb 11 10:17:15 2008
@@ -3646,6 +3646,10 @@
 	unsigned short callno0 = PTR_TO_CALLNO(c0->tech_pvt);
 	unsigned short callno1 = PTR_TO_CALLNO(c1->tech_pvt);
 	struct timeval waittimer = {0, 0}, tv;
+
+	/* We currently do not support native bridging if a timeoutms value has been provided */
+	if (timeoutms)
+		return AST_BRIDGE_FAILED;
 
 	lock_both(callno0, callno1);
 	if (!iaxs[callno0] || !iaxs[callno1]) {

Modified: trunk/main/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/main/channel.c?view=diff&rev=103314&r1=103313&r2=103314
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Mon Feb 11 10:17:15 2008
@@ -4238,7 +4238,6 @@
 			pbx_builtin_setvar_helper(c0, "BRIDGEPVTCALLID", c1->tech->get_pvt_uniqueid(c1));
 		
 		if (c0->tech->bridge &&
-		    (config->timelimit == 0) &&
 		    (c0->tech->bridge == c1->tech->bridge) &&
 		    !nativefailed && !c0->monitor && !c1->monitor &&
 		    !c0->audiohooks && !c1->audiohooks &&