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_iax2.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_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index e27cc14c6..80081174e 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -5689,11 +5689,15 @@ static struct ast_channel *ast_iax2_new(int callno, int state, iax2_format capab /* Don't hold call lock */ ast_mutex_unlock(&iaxsl[callno]); tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, i->accountcode, i->exten, i->context, linkedid, i->amaflags, "IAX2/%s-%d", i->host, i->callno); + if (tmp) { + ast_channel_lock(tmp); + } ast_mutex_lock(&iaxsl[callno]); if (i != iaxs[callno]) { if (tmp) { /* unlock and relock iaxsl[callno] to preserve locking order */ ast_mutex_unlock(&iaxsl[callno]); + ast_channel_unlock(tmp); tmp = ast_channel_release(tmp); ast_mutex_lock(&iaxsl[callno]); } @@ -5803,6 +5807,7 @@ static struct ast_channel *ast_iax2_new(int callno, int state, iax2_format capab } ast_channel_stage_snapshot_done(tmp); + ast_channel_unlock(tmp); if (state != AST_STATE_DOWN) { if (ast_pbx_start(tmp)) { @@ -12234,7 +12239,9 @@ static struct ast_channel *iax2_request(const char *type, struct ast_format_cap if (c) { struct ast_format_cap *joint; if (callid) { + ast_channel_lock(c); ast_channel_callid_set(c, callid); + ast_channel_unlock(c); } /* Choose a format we can live with */ |