aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b>2008-05-12 15:18:10 +0000
committerbbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b>2008-05-12 15:18:10 +0000
commitbd938788e445bf202b09016d1e79a6d29a253161 (patch)
tree42bf329df9a34a346c8ade5e2310239e9eeb080e
parentaea8e14fbd9e51adf67e8a890f7b9d931d41cefc (diff)
Merged revisions 115669 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r115669 | bbryant | 2008-05-12 10:17:32 -0500 (Mon, 12 May 2008) | 3 lines A small change to fix iax2 native bridging. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@115672 f38db490-d61c-443f-a65b-d21fe96a405b
-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 22af598bb..abdad2da6 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -3759,8 +3759,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]) {