From 611a9778bbbfed77050c3d68cb66ea072995347f Mon Sep 17 00:00:00 2001 From: Steve Murphy Date: Sun, 10 Dec 2006 02:14:13 +0000 Subject: [PATCH] This version applies the patch suggested by stevens in bug 7836 (make inbound channel RINGING state consistent with other channels). git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@48371 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_zap.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/channels/chan_zap.c b/channels/chan_zap.c index fee8475c89..277a152c1d 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -3339,7 +3339,7 @@ static int attempt_transfer(struct zt_pvt *p) stop if now if appropriate */ if (ast_bridged_channel(p->subs[SUB_THREEWAY].owner)) ast_moh_stop(ast_bridged_channel(p->subs[SUB_THREEWAY].owner)); - if (p->subs[SUB_THREEWAY].owner->_state == AST_STATE_RINGING) { + if (p->subs[SUB_REAL].owner->_state == AST_STATE_RINGING) { ast_indicate(ast_bridged_channel(p->subs[SUB_REAL].owner), AST_CONTROL_RINGING); } if (p->subs[SUB_REAL].owner->cdr) { @@ -3363,7 +3363,7 @@ static int attempt_transfer(struct zt_pvt *p) ast_mutex_unlock(&p->subs[SUB_THREEWAY].owner->lock); unalloc_sub(p, SUB_THREEWAY); } else if (ast_bridged_channel(p->subs[SUB_THREEWAY].owner)) { - if (p->subs[SUB_REAL].owner->_state == AST_STATE_RINGING) { + if (p->subs[SUB_THREEWAY].owner->_state == AST_STATE_RINGING) { ast_indicate(ast_bridged_channel(p->subs[SUB_THREEWAY].owner), AST_CONTROL_RINGING); } ast_moh_stop(ast_bridged_channel(p->subs[SUB_THREEWAY].owner)); @@ -4853,11 +4853,10 @@ static int zt_indicate(struct ast_channel *chan, int condition) } #endif res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_RINGTONE); - if (chan->_state != AST_STATE_UP) { - if ((chan->_state != AST_STATE_RING) || - ((p->sig != SIG_FXSKS) && + if (chan->_state != AST_STATE_UP && chan->_state != AST_STATE_RING) { + if ((p->sig != SIG_FXSKS) && (p->sig != SIG_FXSLS) && - (p->sig != SIG_FXSGS))) + (p->sig != SIG_FXSGS)) ast_setstate(chan, AST_STATE_RINGING); } break;