native bridging changes

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6944 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming 2005-11-02 17:20:35 +00:00
parent 9693d05882
commit 5f50e4cb93
2 changed files with 5 additions and 5 deletions

View File

@ -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)

View File

@ -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 */