diff options
| author | Mark Michelson <mmichelson@digium.com> | 2013-12-03 17:07:29 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2013-12-03 17:07:29 +0000 |
| commit | 8e8b329e14ad2e4d747c4c4eb33c118305401aee (patch) | |
| tree | 200a9b111d9cf75ab980aedf53ee714b7cc398f2 /channels/chan_unistim.c | |
| parent | 8b24b0d20647697c9ee899dea85871465c3032cb (diff) | |
Add channel locking for channel snapshot creation.
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.
........
Merged revisions 403311 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_unistim.c')
| -rw-r--r-- | channels/chan_unistim.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index 547cd7c2f..93fd9c502 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"); @@ -5563,6 +5565,7 @@ static struct ast_channel *unistim_new(struct unistim_subchannel *sub, int state return NULL; } + ast_channel_lock(tmp); ast_channel_stage_snapshot(tmp); ast_format_cap_copy(ast_channel_nativeformats(tmp), l->cap); @@ -5627,6 +5630,7 @@ 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) { if (unistimdebug) { |