diff options
author | Joshua Colp <jcolp@digium.com> | 2007-10-30 16:15:23 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2007-10-30 16:15:23 +0000 |
commit | a4e38b7cd562fbeea37e74346c01db55dcaac621 (patch) | |
tree | c5cc377e51707bdd2dc5ba9bae597b41637e5993 | |
parent | efe87112fbe160d5ba76ebc410ee1d45e2c91355 (diff) |
Merged revisions 87571 via svnmerge from
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
-rw-r--r-- | res/res_features.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_features.c b/res/res_features.c index 298a63e64..e32a23c69 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -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; } |