From 1212906351c3f4f5f759396c32b5e1dbabd403a4 Mon Sep 17 00:00:00 2001 From: "David M. Lee" Date: Thu, 5 Dec 2013 22:10:20 +0000 Subject: 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 --- channels/sig_analog.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'channels/sig_analog.c') diff --git a/channels/sig_analog.c b/channels/sig_analog.c index 51d3f1495..bbf7a3c8c 100644 --- a/channels/sig_analog.c +++ b/channels/sig_analog.c @@ -2120,7 +2120,6 @@ static void *__analog_ss_thread(void *data) getforward = 0; } else { res = analog_play_tone(p, idx, -1); - ast_channel_lock(chan); ast_channel_exten_set(chan, exten); if (!ast_strlen_zero(p->cid_num)) { if (!p->hidecallerid) { @@ -2135,7 +2134,6 @@ static void *__analog_ss_thread(void *data) } } ast_setstate(chan, AST_STATE_RING); - ast_channel_unlock(chan); analog_set_echocanceller(p, 1); res = ast_pbx_run(chan); if (res) { @@ -2617,10 +2615,8 @@ static void *__analog_ss_thread(void *data) analog_handle_notify_message(chan, p, flags, -1); - ast_channel_lock(chan); ast_setstate(chan, AST_STATE_RING); ast_channel_rings_set(chan, 1); - ast_channel_unlock(chan); analog_set_ringtimeout(p, p->ringt_base); res = ast_pbx_run(chan); if (res) { -- cgit v1.2.3