From 8e8b329e14ad2e4d747c4c4eb33c118305401aee Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Tue, 3 Dec 2013 17:07:29 +0000 Subject: 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 --- addons/chan_mobile.c | 2 ++ addons/chan_ooh323.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'addons') diff --git a/addons/chan_mobile.c b/addons/chan_mobile.c index 2cf7c7dbd..c9e56b854 100644 --- a/addons/chan_mobile.c +++ b/addons/chan_mobile.c @@ -861,6 +861,7 @@ static struct ast_channel *mbl_new(int state, struct mbl_pvt *pvt, char *cid_num goto e_return; } + ast_channel_lock(chn); ast_channel_tech_set(chn, &mbl_tech); ast_format_cap_add(ast_channel_nativeformats(chn), &prefformat); ast_format_copy(ast_channel_rawreadformat(chn), &prefformat); @@ -878,6 +879,7 @@ static struct ast_channel *mbl_new(int state, struct mbl_pvt *pvt, char *cid_num if (pvt->sco_socket != -1) { ast_channel_set_fd(chn, 0, pvt->sco_socket); } + ast_channel_unlock(chn); return chn; diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c index 56a1b7b68..deec21fa7 100644 --- a/addons/chan_ooh323.c +++ b/addons/chan_ooh323.c @@ -2153,8 +2153,8 @@ int onCallEstablished(ooCallData *call) } ast_queue_control(c, AST_CONTROL_ANSWER); - ast_channel_unlock(p->owner); ast_publish_channel_state(c); + ast_channel_unlock(p->owner); } ast_mutex_unlock(&p->lock); -- cgit v1.2.3