diff options
| author | David M. Lee <dlee@digium.com> | 2013-12-05 22:10:20 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2013-12-05 22:10:20 +0000 |
| commit | 1212906351c3f4f5f759396c32b5e1dbabd403a4 (patch) | |
| tree | 285c7eea05e3b246fe9560fae93d9d79dd5f2ad0 /channels/chan_iax2.c | |
| parent | fc70db3a810dae81e0ba0e09ecf11468bbef4d54 (diff) | |
Reverting r403311. It's causing ARI tests to hang.
........
Merged revisions 403398 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403404 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 80081174e..e27cc14c6 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -5689,15 +5689,11 @@ 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]); } @@ -5807,7 +5803,6 @@ 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)) { @@ -12239,9 +12234,7 @@ 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 */ |