[svn-commits] file: trunk r81402 - in /trunk: ./ res/res_features.c

[SVN commits to the Digium repositories]

Author: file
Date: Thu Aug 30 18:55:39 2007
New Revision: 81402

URL: http://svn.digium.com/view/asterisk?view=rev&rev=81402
Log:
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.

........

Modified:
    trunk/   (props changed)
    trunk/res/res_features.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?view=diff&rev=81402&r1=81401&r2=81402
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Thu Aug 30 18:55:39 2007
@@ -1864,7 +1864,8 @@
 			}
 		}
 		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;
 		}