Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 48372 via svnmerge from

Browse Source 
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
1.6.0
Steve Murphy 19 years ago
parent a9415d4b8e
commit 23e606f70a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File

11
channels/chan_zap.c
Unescape View File

@ -3749,9 +3749,12 @@ static int attempt_transfer(struct zt_pvt *p)
stop if now if appropriate */ stop if now if appropriate */
if (ast_bridged_channel(p->subs[SUB_THREEWAY].owner)) if (ast_bridged_channel(p->subs[SUB_THREEWAY].owner))
ast_queue_control(p->subs[SUB_THREEWAY].owner, AST_CONTROL_UNHOLD); 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); 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) { if (p->subs[SUB_REAL].owner->cdr) {
/* Move CDR from second channel to current one */ /* Move CDR from second channel to current one */
p->subs[SUB_THREEWAY].owner->cdr = p->subs[SUB_THREEWAY].owner->cdr =
@ -3774,8 +3777,12 @@ static int attempt_transfer(struct zt_pvt *p)
unalloc_sub(p, SUB_THREEWAY); unalloc_sub(p, SUB_THREEWAY);
} else if (ast_bridged_channel(p->subs[SUB_THREEWAY].owner)) { } else if (ast_bridged_channel(p->subs[SUB_THREEWAY].owner)) {
ast_queue_control(p->subs[SUB_REAL].owner, AST_CONTROL_UNHOLD); 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); 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) { if (p->subs[SUB_THREEWAY].owner->cdr) {
/* Move CDR from second channel to current one */ /* Move CDR from second channel to current one */
p->subs[SUB_REAL].owner->cdr = p->subs[SUB_REAL].owner->cdr =

Write Preview
Loading…
Cancel
Save