diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-02 17:20:35 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-02 17:20:35 +0000 |
commit | 05f53b2eb912b3399976d7c91c0a1d33227e473f (patch) | |
tree | 7392f8bac32a63a6efcfcea082b0deb8698a1e11 | |
parent | dee595bc534fc20b92d568470fab6c158e34240c (diff) |
native bridging changes
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6944 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | ChangeLog | 4 | ||||
-rwxr-xr-x | channel.c | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -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) @@ -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 */ |