|
|
|
@ -4659,7 +4659,6 @@ static void update_bridgepeer(struct ast_channel *c0, struct ast_channel *c1)
|
|
|
|
|
enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1,
|
|
|
|
|
struct ast_bridge_config *config, struct ast_frame **fo, struct ast_channel **rc)
|
|
|
|
|
{
|
|
|
|
|
struct ast_channel *who = NULL;
|
|
|
|
|
enum ast_bridge_result res = AST_BRIDGE_COMPLETE;
|
|
|
|
|
int nativefailed=0;
|
|
|
|
|
int firstpass;
|
|
|
|
@ -4766,8 +4765,6 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
|
|
|
|
|
if (callee_warning && config->end_sound)
|
|
|
|
|
bridge_playfile(c1, c0, config->end_sound, 0);
|
|
|
|
|
*fo = NULL;
|
|
|
|
|
if (who)
|
|
|
|
|
*rc = who;
|
|
|
|
|
res = 0;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
@ -4804,8 +4801,6 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
|
|
|
|
|
if (ast_test_flag(c0, AST_FLAG_ZOMBIE) || ast_check_hangup_locked(c0) ||
|
|
|
|
|
ast_test_flag(c1, AST_FLAG_ZOMBIE) || ast_check_hangup_locked(c1)) {
|
|
|
|
|
*fo = NULL;
|
|
|
|
|
if (who)
|
|
|
|
|
*rc = who;
|
|
|
|
|
res = 0;
|
|
|
|
|
if (option_debug)
|
|
|
|
|
ast_log(LOG_DEBUG, "Bridge stops because we're zombie or need a soft hangup: c0=%s, c1=%s, flags: %s,%s,%s,%s\n",
|
|
|
|
|