diff options
| author | Joshua Colp <jcolp@digium.com> | 2007-08-30 23:55:39 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2007-08-30 23:55:39 +0000 |
| commit | 83ea59acd9b21c5e4f08f00044c6e7de578713bd (patch) | |
| tree | 5b0f6ddeb0eb057b41cebc02141e0942bb873fa2 /res/res_features.c | |
| parent | acb51ca5c28a9f67c3a338e7b88f1c6a5bfe1321 (diff) | |
Merged revisions 81401 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81401 | file | 2007-08-30 20:53:41 -0300 (Thu, 30 Aug 2007) | 4 lines
(closes issue #10009)
Reported by: dimas
Don't output a bridge failed warning message if it failed because one of the channels was part of the masquerade process. That is perfectly normal.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81402 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_features.c')
| -rw-r--r-- | res/res_features.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/res/res_features.c b/res/res_features.c index 3f74296e5..d34fc7c3d 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -1864,7 +1864,8 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast } } if (res < 0) { - ast_log(LOG_WARNING, "Bridge failed on channels %s and %s\n", chan->name, peer->name); + 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); return -1; } |