From: Joshua Colp <jcolp@digium.com>
Date: Thu, 30 Aug 2007 23:53:41 +0000 (+0000)
Subject: (closes issue #10009)
X-Git-Tag: 1.4.12~153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=279d96a9744bfe8a1c107b4c09bc76f3fdc8a553;p=thirdparty%2Fasterisk.git

(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/branches/1.4@81401 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_features.c b/res/res_features.c
index 405af454fa..87e84ed0c5 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -1457,7 +1457,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;
 		}