From: Brett Bryant <bbryant@digium.com>
Date: Mon, 12 May 2008 15:17:32 +0000 (+0000)
Subject: A small change to fix iax2 native bridging.
X-Git-Tag: 1.6.2.0-beta1~2269
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9575b8238928cc4e919a6234992e4c511b629e48;p=thirdparty%2Fasterisk.git

A small change to fix iax2 native bridging.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@115669 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index e9e5df3e2c..85bcdb4a86 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]) {