[svn-commits] dvossel: branch 1.6.1 r198826 - in /branches/1.6.1: ./ channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Tue Jun  2 12:56:59 2009
New Revision: 198826

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=198826
Log:
Merged revisions 198824 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r198824 | dvossel | 2009-06-02 12:55:35 -0500 (Tue, 02 Jun 2009) | 8 lines
  
  fixes issue with channels not going down after transfer
  
  Iax2 currently does not support native bridging if the timeoutms value is set.  We check for that in iax2_bridge, but then set timeoutms to 0 by default.  If the timeoutms is not provided it is set to -1. By setting timeoutms to 0 it is processed causing a bridging retry loop.
  
  (closes issue #15216)
  Reported by: oxymoron
  Tested by: dvossel
........

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

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

Modified: branches/1.6.1/channels/chan_iax2.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_iax2.c?view=diff&rev=198826&r1=198825&r2=198826
==============================================================================
--- branches/1.6.1/channels/chan_iax2.c (original)
+++ branches/1.6.1/channels/chan_iax2.c Tue Jun  2 12:56:59 2009
@@ -4099,7 +4099,7 @@
 		return AST_BRIDGE_FAILED;
 	}
 
-	timeoutms = 0;
+	timeoutms = -1;
 
 	lock_both(callno0, callno1);
 	if (!iaxs[callno0] || !iaxs[callno1]) {