kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-23 13:09:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix up handling and indications during transfer.

Browse Source 
Cleaned up handling of onhook indications and added indications if more than one sub on device. Also fixes issue in 12324 so that the phone can call itself without locking up.

(closes issue #17692)
Reported by: jmhunter
Patches:
      chan_skinny-transfer-v4.txt uploaded by DEA (license 3)
      skinnytransfver.v8.diff uploaded by wedhorn (license 30)
Tested by: jmhunter, salecha, wedhorn

Review: NA 


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@281257 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Damien Wedhorn
2010-08-07 22:36:08 +00:00
parent 394fa75a0a
commit f8d64f8614
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
channels/chan_skinny.c
View File

@@ -4075,12 +4075,15 @@ static int skinny_hangup(struct ast_channel *ast)
l->activesub = AST_LIST_FIRST(&l->sub);
}
}
//transmit_callstate(d, l->instance, SKINNY_ONHOOK, sub->callid);
transmit_activatecallplane(d, l);
if (l->activesub) {
transmit_selectsoftkeys(d, 0, 0, KEYDEF_ONHOLD);
}
transmit_closereceivechannel(d, sub);
transmit_stopmediatransmission(d, sub);
transmit_lamp_indication(d, STIMULUS_LINE, l->instance, SKINNY_LAMP_BLINK);
transmit_stop_tone(d, l->instance, sub->callid);
transmit_callstate(d, l->instance, sub->callid, SKINNY_ONHOOK);
transmit_activatecallplane(d, l);
} else { /* we are killing a background sub on the line with other subs*/
ast_verb(4,"Killing inactive sub %d\n", sub->callid);
if (AST_LIST_NEXT(sub, list)) {
@@ -4088,6 +4091,8 @@ static int skinny_hangup(struct ast_channel *ast)
} else {
transmit_lamp_indication(d, STIMULUS_LINE, l->instance, SKINNY_LAMP_ON);
}
transmit_callstate(d, l->instance, sub->callid, SKINNY_ONHOOK);
transmit_activatecallplane(d, l);
}
} else { /* no more subs on line so make idle */
ast_verb(4,"Killing only sub %d\n", sub->callid);
@@ -4790,7 +4795,7 @@ static int handle_transfer_button(struct skinny_subchannel *sub)
sub->related = newsub;
newsub->xferor = 1;
l->activesub = newsub;
transmit_callstate(d, l->instance, sub->callid, SKINNY_OFFHOOK);
transmit_callstate(d, l->instance, newsub->callid, SKINNY_OFFHOOK);
transmit_activatecallplane(d, l);
transmit_clear_display_message(d, l->instance, newsub->callid);
transmit_start_tone(d, SKINNY_DIALTONE, l->instance, newsub->callid);