diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-10 03:04:18 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-10 03:04:18 +0000 |
| commit | 8b2c905a6c6adbeac57d717fea391beec10c5e3d (patch) | |
| tree | 51e2709668638e6f91416b980129c7594ae466c1 | |
| parent | 27648fd608ce9da2b701aceb0d289c964ee7f2a4 (diff) | |
Merged revisions 48371 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48371 | murf | 2006-12-09 19:14:13 -0700 (Sat, 09 Dec 2006) | 1 line
This version applies the patch suggested by stevens in bug 7836 (make inbound channel RINGING state consistent with other channels).
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@48372 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_zap.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 348856f10..62195ee2d 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -3508,9 +3508,12 @@ static int attempt_transfer(struct zt_pvt *p) stop if now if appropriate */ if (ast_bridged_channel(p->subs[SUB_THREEWAY].owner)) ast_queue_control(p->subs[SUB_THREEWAY].owner, AST_CONTROL_UNHOLD); - 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_THREEWAY].owner->_state == AST_STATE_RING) { + tone_zone_play_tone(p->subs[SUB_THREEWAY].zfd, ZT_TONE_RINGTONE); + } if (p->subs[SUB_REAL].owner->cdr) { /* Move CDR from second channel to current one */ p->subs[SUB_THREEWAY].owner->cdr = @@ -3533,8 +3536,12 @@ static int attempt_transfer(struct zt_pvt *p) unalloc_sub(p, SUB_THREEWAY); } else if (ast_bridged_channel(p->subs[SUB_THREEWAY].owner)) { ast_queue_control(p->subs[SUB_REAL].owner, AST_CONTROL_UNHOLD); - 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); + } + if (p->subs[SUB_REAL].owner->_state == AST_STATE_RING) { + tone_zone_play_tone(p->subs[SUB_REAL].zfd, ZT_TONE_RINGTONE); + } if (p->subs[SUB_THREEWAY].owner->cdr) { /* Move CDR from second channel to current one */ p->subs[SUB_REAL].owner->cdr = |