diff options
| author | David M. Lee <dlee@digium.com> | 2013-12-05 22:10:20 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2013-12-05 22:10:20 +0000 |
| commit | 1212906351c3f4f5f759396c32b5e1dbabd403a4 (patch) | |
| tree | 285c7eea05e3b246fe9560fae93d9d79dd5f2ad0 /main/bridge_channel.c | |
| parent | fc70db3a810dae81e0ba0e09ecf11468bbef4d54 (diff) | |
Reverting r403311. It's causing ARI tests to hang.
........
Merged revisions 403398 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403404 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/bridge_channel.c')
| -rw-r--r-- | main/bridge_channel.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/main/bridge_channel.c b/main/bridge_channel.c index ae33cd056..96bfb209a 100644 --- a/main/bridge_channel.c +++ b/main/bridge_channel.c @@ -235,16 +235,12 @@ void ast_bridge_channel_update_linkedids(struct ast_bridge_channel *bridge_chann return; } - ast_channel_lock(bridge_channel->chan); ast_channel_linkedid_set(bridge_channel->chan, oldest_linkedid); - ast_channel_unlock(bridge_channel->chan); AST_LIST_TRAVERSE(&bridge->channels, other, entry) { if (other == swap) { continue; } - ast_channel_lock(other->chan); ast_channel_linkedid_set(other->chan, oldest_linkedid); - ast_channel_unlock(other->chan); } } @@ -257,7 +253,6 @@ void ast_bridge_channel_update_accountcodes(struct ast_bridge_channel *bridge_ch if (other == swap) { continue; } - ast_channel_lock_both(bridge_channel->chan, other->chan); if (!ast_strlen_zero(ast_channel_accountcode(bridge_channel->chan)) && ast_strlen_zero(ast_channel_peeraccount(other->chan))) { ast_debug(1, "Setting peeraccount to %s for %s from data on channel %s\n", @@ -291,8 +286,6 @@ void ast_bridge_channel_update_accountcodes(struct ast_bridge_channel *bridge_ch ast_channel_peeraccount_set(bridge_channel->chan, ast_channel_accountcode(other->chan)); } } - ast_channel_unlock(bridge_channel->chan); - ast_channel_unlock(other->chan); } } @@ -631,18 +624,14 @@ int ast_bridge_channel_write_hold(struct ast_bridge_channel *bridge_channel, con datalen = 0; } - ast_channel_lock(bridge_channel->chan); ast_channel_publish_blob(bridge_channel->chan, ast_channel_hold_type(), blob); - ast_channel_unlock(bridge_channel->chan); return ast_bridge_channel_write_control_data(bridge_channel, AST_CONTROL_HOLD, moh_class, datalen); } int ast_bridge_channel_write_unhold(struct ast_bridge_channel *bridge_channel) { - ast_channel_lock(bridge_channel->chan); ast_channel_publish_blob(bridge_channel->chan, ast_channel_unhold_type(), NULL); - ast_channel_unlock(bridge_channel->chan); return ast_bridge_channel_write_control_data(bridge_channel, AST_CONTROL_UNHOLD, NULL, 0); } |