aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2008-02-11 16:17:15 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2008-02-11 16:17:15 +0000
commit5dfa4987a0f0b65e4610b2fa26e77274036ac988 (patch)
tree8a3a6c6b19c9a499ed60d40e963ef5d15f6d165a /channels
parentae87ed1abb578db02a3cee5c5cfd98052e53b945 (diff)
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 git-svn-id: http://svn.digium.com/svn/asterisk/trunk@103314 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_iax2.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 990ab41fd..c82c88fee 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -3647,6 +3647,10 @@ static enum ast_bridge_result iax2_bridge(struct ast_channel *c0, struct ast_cha
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]) {
unlock_both(callno0, callno1);