diff options
| author | Steve Murphy <murf@digium.com> | 2006-12-10 03:14:27 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2006-12-10 03:14:27 +0000 |
| commit | 23e606f70ab2fbcc66be3130ea5253731d82cbcd (patch) | |
| tree | 3389b7e935013db1d91652cff8dc6dbe36dae3bf | |
| parent | a9415d4b8ecf8e1b8636c491f1b437eede29f221 (diff) | |
Merged revisions 48372 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48372 | murf | 2006-12-09 20:04:18 -0700 (Sat, 09 Dec 2006) | 9 lines
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: https://origsvn.digium.com/svn/asterisk/trunk@48373 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -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 02341fd25..394c12bb2 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -3749,9 +3749,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 = @@ -3774,8 +3777,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 = |