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
........

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 3c0f71e2aff87b418363b4f2bc30eace692fd520..200404cf3f180ebc01a9be00d99eb3e972b33d03 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -4099,7 +4099,7 @@ static enum ast_bridge_result iax2_bridge(struct ast_channel *c0, struct ast_cha
                return AST_BRIDGE_FAILED;
        }
 
-       timeoutms = 0;
+       timeoutms = -1;
 
        lock_both(callno0, callno1);
        if (!iaxs[callno0] || !iaxs[callno1]) {