Merged revisions 87571 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Tue, 30 Oct 2007 16:15:23 +0000 (16:15 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 30 Oct 2007 16:15:23 +0000 (16:15 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r87571 | file | 2007-10-30 13:13:39 -0300 (Tue, 30 Oct 2007) | 4 lines

Add two more checks before printing out a warning message about bridging. If either channel has hungup of course the bridge will have failed.
(closes issue #10009)
Reported by: dimas

........

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

res/res_features.c

index 298a63e..e32a23c 100644 (file)
@@ -1887,8 +1887,8 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
                        }
                }
                if (res < 0) {
-                       if (!ast_test_flag(chan, AST_FLAG_ZOMBIE) && !ast_test_flag(peer, AST_FLAG_ZOMBIE))
-                               ast_log(LOG_WARNING, "Bridge failed on channels %s and %s, res = %d\n", chan->name, peer->name, res);
+                       if (!ast_test_flag(chan, AST_FLAG_ZOMBIE) && !ast_test_flag(peer, AST_FLAG_ZOMBIE) && !ast_check_hangup(chan) && !ast_check_hangup(peer))
+                               ast_log(LOG_WARNING, "Bridge failed on channels %s and %s\n", chan->name, peer->name);
                        return -1;
                }