diff options
| author | Joshua Colp <jcolp@digium.com> | 2013-12-18 19:28:05 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2013-12-18 19:28:05 +0000 |
| commit | e2630fcd516b8f794bf342d9fd267b0c905e79ce (patch) | |
| tree | f6cd5cf70eb9af24b239d78391aed7472c09dd7f /addons | |
| parent | e23b8d19a49d4ee4faf3dc167ddb7ba7afe36a46 (diff) | |
channels: Return allocated channels locked.
This change makes ast_channel_alloc return allocated channels
locked. By doing so no other thread can acquire, lock, and manipulate
the channel before it is completely set up.
(closes issue AST-1256)
Review: https://reviewboard.asterisk.org/r/3067/
........
Merged revisions 404204 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404210 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/chan_mobile.c | 2 | ||||
| -rw-r--r-- | addons/chan_ooh323.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/addons/chan_mobile.c b/addons/chan_mobile.c index 2cf7c7dbd..a76d778c4 100644 --- a/addons/chan_mobile.c +++ b/addons/chan_mobile.c @@ -879,6 +879,8 @@ static struct ast_channel *mbl_new(int state, struct mbl_pvt *pvt, char *cid_num ast_channel_set_fd(chn, 0, pvt->sco_socket); } + ast_channel_unlock(chn); + return chn; e_return: diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c index ff0a030ad..d89e00c2e 100644 --- a/addons/chan_ooh323.c +++ b/addons/chan_ooh323.c @@ -395,7 +395,6 @@ static struct ast_channel *ooh323_new(struct ooh323_pvt *i, int state, ast_mutex_lock(&i->lock); if (ch) { - ast_channel_lock(ch); ast_channel_tech_set(ch, &ooh323_tech); if (cap) |