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_dahdi.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_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 2eba958a8..843254c56 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -1667,7 +1667,9 @@ static void publish_dahdichannel(struct ast_channel *chan, int span, const char return; } + ast_channel_lock(chan); ast_channel_publish_blob(chan, dahdichannel_type(), blob); + ast_channel_unlock(chan); } /*! @@ -8916,6 +8918,7 @@ static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpb return NULL; } + ast_channel_lock(tmp); ast_channel_stage_snapshot(tmp); if (callid) { @@ -9096,6 +9099,7 @@ static struct ast_channel *dahdi_new(struct dahdi_pvt *i, int state, int startpb pbx_builtin_setvar_helper(tmp, v->name, v->value); ast_channel_stage_snapshot_done(tmp); + ast_channel_unlock(tmp); ast_module_ref(ast_module_info->self); @@ -9614,6 +9618,7 @@ static void *analog_ss_thread(void *data) getforward = 0; } else { res = tone_zone_play_tone(p->subs[idx].dfd, -1); + ast_channel_lock(chan); ast_channel_exten_set(chan, exten); if (!ast_strlen_zero(p->cid_num)) { if (!p->hidecallerid) @@ -9626,6 +9631,7 @@ static void *analog_ss_thread(void *data) ast_set_callerid(chan, NULL, p->cid_name, NULL); } ast_setstate(chan, AST_STATE_RING); + ast_channel_unlock(chan); dahdi_ec_enable(p); res = ast_pbx_run(chan); if (res) { @@ -10389,8 +10395,10 @@ static void *analog_ss_thread(void *data) my_handle_notify_message(chan, p, flags, -1); + ast_channel_lock(chan); ast_setstate(chan, AST_STATE_RING); ast_channel_rings_set(chan, 1); + ast_channel_unlock(chan); p->ringt = p->ringt_base; res = ast_pbx_run(chan); if (res) { |