summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorBrett Bryant <bbryant@digium.com>2008-05-12 15:17:32 +0000
committerBrett Bryant <bbryant@digium.com>2008-05-12 15:17:32 +0000
commit9575b8238928cc4e919a6234992e4c511b629e48 (patch)
tree254a4c46af3eca7de2246fae1ab6ea179db36a89 /channels
parent5e3d36e4aaf9c94917a8a0ed16ee9f0b140dcf51 (diff)
A small change to fix iax2 native bridging.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@115669 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_iax2.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index e9e5df3e2..85bcdb4a8 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -3766,8 +3766,11 @@ static enum ast_bridge_result iax2_bridge(struct ast_channel *c0, struct ast_cha
struct timeval waittimer = {0, 0}, tv;
/* We currently do not support native bridging if a timeoutms value has been provided */
- if (timeoutms)
+ if (timeoutms > 0) {
return AST_BRIDGE_FAILED;
+ }
+
+ timeoutms = 0;
lock_both(callno0, callno1);
if (!iaxs[callno0] || !iaxs[callno1]) {