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

[SVN commits to the Digium repositories]

Author: file
Date: Tue Oct 30 11:15:23 2007
New Revision: 87572

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

........

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=87572&r1=87571&r2=87572
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Tue Oct 30 11:15:23 2007
@@ -1887,8 +1887,8 @@
 			}
 		}
 		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;
 		}