mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 03:20:57 +00:00
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
This commit is contained in:
@@ -862,6 +862,7 @@ static struct ast_channel *phone_new(struct phone_pvt *i, int state, char *cntx,
|
||||
struct ast_format tmpfmt;
|
||||
tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, "", i->ext, i->context, linkedid, 0, "Phone/%s", i->dev + 5);
|
||||
if (tmp) {
|
||||
ast_channel_lock(tmp);
|
||||
ast_channel_tech_set(tmp, cur_tech);
|
||||
ast_channel_set_fd(tmp, 0, i->fd);
|
||||
/* XXX Switching formats silently causes kernel panics XXX */
|
||||
@@ -898,6 +899,7 @@ static struct ast_channel *phone_new(struct phone_pvt *i, int state, char *cntx,
|
||||
ast_channel_caller(tmp)->ani.number.valid = 1;
|
||||
ast_channel_caller(tmp)->ani.number.str = ast_strdup(i->cid_num);
|
||||
}
|
||||
ast_channel_unlock(tmp);
|
||||
|
||||
i->owner = tmp;
|
||||
ast_module_ref(ast_module_info->self);
|
||||
|
Reference in New Issue
Block a user