[svn-commits] bbryant: branch 1.6.0 r115672 - in /branches/1.6.0: ./ channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: bbryant
Date: Mon May 12 10:18:10 2008
New Revision: 115672

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115672
Log:
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.


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_iax2.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_iax2.c?view=diff&rev=115672&r1=115671&r2=115672
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Mon May 12 10:18:10 2008
@@ -3759,8 +3759,11 @@
 	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]) {