kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "bridge_channel.c: Fix Deadlock when using Local channels and fax gateway"

Browse Source
This commit is contained in:
Joshua Colp
2018-06-06 05:46:47 -05:00
committed by Gerrit Code Review
parent 2151903a16 e078558038
commit c98c1b3f74
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/bridge_channel.c
View File

@@ -2820,6 +2820,7 @@ static void bridge_channel_event_join_leave(struct ast_bridge_channel *bridge_ch
int bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel) int bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel)
{ {
int res = 0; int res = 0;
uint8_t indicate_src_change = 0;
struct ast_bridge_features *channel_features; struct ast_bridge_features *channel_features;
struct ast_channel *swap; struct ast_channel *swap;
@@ -2889,7 +2890,7 @@ int bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel)
*/ */
if (!(bridge_channel->bridge->technology->capabilities if (!(bridge_channel->bridge->technology->capabilities
& AST_BRIDGE_CAPABILITY_MULTIMIX)) { & AST_BRIDGE_CAPABILITY_MULTIMIX)) {
ast_indicate(bridge_channel->chan, AST_CONTROL_SRCCHANGE); indicate_src_change = 1;
} }
bridge_channel_impart_signal(bridge_channel->chan); bridge_channel_impart_signal(bridge_channel->chan);
@@ -2899,6 +2900,10 @@ int bridge_channel_internal_join(struct ast_bridge_channel *bridge_channel)
ao2_t_cleanup(swap, "Bridge push with swap successful"); ao2_t_cleanup(swap, "Bridge push with swap successful");
swap = NULL; swap = NULL;
if (indicate_src_change) {
ast_indicate(bridge_channel->chan, AST_CONTROL_SRCCHANGE);
}
bridge_channel_event_join_leave(bridge_channel, AST_BRIDGE_HOOK_TYPE_JOIN); bridge_channel_event_join_leave(bridge_channel, AST_BRIDGE_HOOK_TYPE_JOIN);
while (bridge_channel->state == BRIDGE_CHANNEL_STATE_WAIT) { while (bridge_channel->state == BRIDGE_CHANNEL_STATE_WAIT) {