kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-04 20:25:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "bridge_channel.c: Ignore role setup failure in channel push." into 13

Browse Source
This commit is contained in:
Joshua Colp
2016-04-19 09:37:30 -05:00
committed by Gerrit Code Review
parent f436b9ab11 f4693d1897
commit c922846c6d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/bridge_channel.c
View File

@@ -2117,13 +2117,14 @@ int bridge_channel_internal_push_full(struct ast_bridge_channel *bridge_channel,
if (bridge->dissolved if (bridge->dissolved
|| bridge_channel->state != BRIDGE_CHANNEL_STATE_WAIT || bridge_channel->state != BRIDGE_CHANNEL_STATE_WAIT
|| (swap && swap->state != BRIDGE_CHANNEL_STATE_WAIT) || (swap && swap->state != BRIDGE_CHANNEL_STATE_WAIT)
|| bridge->v_table->push(bridge, bridge_channel, swap) || bridge->v_table->push(bridge, bridge_channel, swap)) {
|| ast_bridge_channel_establish_roles(bridge_channel)) {
ast_debug(1, "Bridge %s: pushing %p(%s) into bridge failed\n", ast_debug(1, "Bridge %s: pushing %p(%s) into bridge failed\n",
bridge->uniqueid, bridge_channel, ast_channel_name(bridge_channel->chan)); bridge->uniqueid, bridge_channel, ast_channel_name(bridge_channel->chan));
return -1; return -1;
} }
ast_bridge_channel_establish_roles(bridge_channel);
if (swap) { if (swap) {
int dissolve = ast_test_flag(&bridge->feature_flags, AST_BRIDGE_FLAG_DISSOLVE_EMPTY); int dissolve = ast_test_flag(&bridge->feature_flags, AST_BRIDGE_FLAG_DISSOLVE_EMPTY);