diff options
| author | Kevin Harwell <kharwell@digium.com> | 2013-12-18 20:33:37 +0000 |
|---|---|---|
| committer | Kevin Harwell <kharwell@digium.com> | 2013-12-18 20:33:37 +0000 |
| commit | 28c0cb28d0815e5e59ab99b60ac6b50e1ed9cbae (patch) | |
| tree | b42967f4899ba28aea79b9a11827c814b95b62c8 /channels/chan_unistim.c | |
| parent | 86b5e11607e2e3b7dcfb0b72d41b492ce868f31c (diff) | |
channel locking: Add locking for channel snapshot creation
Original commit message by mmichelson (asterisk 12 r403311):
"This adds channel locks around calls to create channel snapshots as well
as other functions which operate on a channel and then end up
creating a channel snapshot. Functions that expect the channel to be
locked prior to being called have had their documentation updated to
indicate such."
The above was initially committed and then reverted at r403398. The problem
was found to be in core_local.c in the publish_local_bridge_message function.
The ast_unreal_lock_all function locks and adds a reference to the returned
channels and while they were being unlocked they were not being unreffed when
no longer needed. Fixed by unreffing the channels.
Also in bridge.c a lock was obtained on "other->chan", but then an attempt was
made to unlock "other" and not the previously locked channel. Fixed by
unlocking "other->chan"
(closes issue ASTERISK-22709)
Reported by: John Bigelow
........
Merged revisions 404237 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404260 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_unistim.c')
| -rw-r--r-- | channels/chan_unistim.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index 21bbbc1e8..bc79f5ee0 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -2517,10 +2517,12 @@ static void *unistim_ss(void *data) int res; ast_verb(3, "Starting switch on '%s@%s-%d' to %s\n", l->name, l->parent->name, sub->softkey, s->device->phone_number); + ast_channel_lock(chan); ast_channel_exten_set(chan, s->device->phone_number); + ast_setstate(chan, AST_STATE_RING); + ast_channel_unlock(chan); ast_copy_string(s->device->redial_number, s->device->phone_number, sizeof(s->device->redial_number)); - ast_setstate(chan, AST_STATE_RING); res = ast_pbx_run(chan); if (res) { ast_log(LOG_WARNING, "PBX exited non-zero\n"); @@ -5627,7 +5629,6 @@ static struct ast_channel *unistim_new(struct unistim_subchannel *sub, int state ast_channel_priority_set(tmp, 1); ast_channel_stage_snapshot_done(tmp); - ast_channel_unlock(tmp); if (state != AST_STATE_DOWN) { |