diff --git a/ChangeLog b/ChangeLog index 3dd19d4e09ca0f466d20318d8a65f61b99d72626..9ddbd8a227539141a158488cc79e22772e1bd7c5 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 e2448436aa858cfffe1b58f79c5f4521dc22a532..91c9fa355c9ec62937f730f714313d1947cd86b5 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 */