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_mgcp.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_mgcp.c')
| -rw-r--r-- | channels/chan_mgcp.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index c10697158..84fb3b225 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -1507,7 +1507,6 @@ static struct ast_channel *mgcp_new(struct mgcp_subchannel *sub, int state, cons tmp = ast_channel_alloc(1, state, i->cid_num, i->cid_name, linkedid, i->accountcode, i->exten, i->context, i->amaflags, "MGCP/%s@%s-%d", i->name, i->parent->name, sub->id); if (tmp) { - ast_channel_lock(tmp); ast_channel_stage_snapshot(tmp); ast_channel_tech_set(tmp, &mgcp_tech); ast_format_cap_copy(ast_channel_nativeformats(tmp), i->cap); @@ -1571,7 +1570,6 @@ static struct ast_channel *mgcp_new(struct mgcp_subchannel *sub, int state, cons } ast_channel_stage_snapshot_done(tmp); - ast_channel_unlock(tmp); if (state != AST_STATE_DOWN) { if (ast_pbx_start(tmp)) { @@ -3048,7 +3046,6 @@ static void *mgcp_ss(void *data) } else { /*res = tone_zone_play_tone(p->subs[index].zfd, -1);*/ ast_indicate(chan, -1); - ast_channel_lock(chan); ast_channel_exten_set(chan, p->dtmf_buf); ast_channel_dialed(chan)->number.str = ast_strdup(p->dtmf_buf); memset(p->dtmf_buf, 0, sizeof(p->dtmf_buf)); @@ -3057,7 +3054,6 @@ static void *mgcp_ss(void *data) p->hidecallerid ? "" : p->cid_name, ast_channel_caller(chan)->ani.number.valid ? NULL : p->cid_num); ast_setstate(chan, AST_STATE_RING); - ast_channel_unlock(chan); if (p->dtmfmode & MGCP_DTMF_HYBRID) { p->dtmfmode |= MGCP_DTMF_INBAND; ast_indicate(chan, -1); |