From: Kevin P. Fleming <kpfleming@digium.com>
Date: Wed, 2 Nov 2005 17:20:35 +0000 (+0000)
Subject: native bridging changes
X-Git-Tag: 1.2.0-rc1~102
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f50e4cb93a1393a53e1d18b6d413de28138aa91;p=thirdparty%2Fasterisk.git

native bridging changes


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6944 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/ChangeLog b/ChangeLog
index 3dd19d4e09..9ddbd8a227 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-02  Kevin P. Fleming  <kpfleming@digium.com>
+
+	* channel.c (ast_channel_bridge): simplify native-bridge return logic, remove 'unsuccessful' message since it causes too many questions :-)
+
 2005-11-01  Kevin P. Fleming  <kpfleming@digium.com>
 
 	* stdtime/localtime.c: fix build failure on uClibc systems (issue #5558)
diff --git a/channel.c b/channel.c
index e2448436aa..91c9fa355c 100755
--- a/channel.c
+++ b/channel.c
@@ -3460,14 +3460,10 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
 			} else {
 				ast_clear_flag(c0, AST_FLAG_NBRIDGE);
 				ast_clear_flag(c1, AST_FLAG_NBRIDGE);
-				ast_verbose(VERBOSE_PREFIX_3 "Native bridge of %s and %s was unsuccessful\n", c0->name, c1->name);
 			}
-			if (res == AST_BRIDGE_RETRY)
-				continue;
 			switch (res) {
 			case AST_BRIDGE_RETRY:
-/*				continue; */
-				break;
+				continue;
 			default:
 				ast_log(LOG_WARNING, "Private bridge between %s and %s failed\n", c0->name, c1->name);
 				/* fallthrough */