kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 19:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add setsubstate_busy.

Browse Source 
Move handling of setting busy state from skinny_indicate to it's own sub.
Also, modified behaviour to not hangup the sub and let the dialplan
have a chance in doing what it wants (eg busy(10); hangup() in the dialplan
now gives a busy indication for 10 secs and then hangs up.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316994 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Damien Wedhorn
2011-05-05 08:10:14 +00:00
parent 19eb6c7384
commit 468b8229a7
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
channels/chan_skinny.c
View File

@@ -1189,6 +1189,7 @@ static int matchdigittimeout = 3000;
#define SUBSTATE_RINGOUT 3 #define SUBSTATE_RINGOUT 3
#define SUBSTATE_RINGIN 4 #define SUBSTATE_RINGIN 4
#define SUBSTATE_CONNECTED 5 #define SUBSTATE_CONNECTED 5
#define SUBSTATE_BUSY 6
#define SUBSTATE_DIALING 101 #define SUBSTATE_DIALING 101
struct skinny_subchannel { struct skinny_subchannel {
@@ -1415,6 +1416,7 @@ static void setsubstate_dialing(struct skinny_subchannel *sub, char exten[AST_MA
static void setsubstate_ringin(struct skinny_subchannel *sub); static void setsubstate_ringin(struct skinny_subchannel *sub);
static void setsubstate_ringout(struct skinny_subchannel *sub); static void setsubstate_ringout(struct skinny_subchannel *sub);
static void setsubstate_connected(struct skinny_subchannel *sub); static void setsubstate_connected(struct skinny_subchannel *sub);
static void setsubstate_busy(struct skinny_subchannel *sub);
static struct ast_channel_tech skinny_tech = { static struct ast_channel_tech skinny_tech = {
.type = "Skinny", .type = "Skinny",
@@ -4498,23 +4500,10 @@ static int skinny_indicate(struct ast_channel *ast, int ind, const void *data, s
break; break;
} }
setsubstate_ringout(sub); setsubstate_ringout(sub);
if (!d->earlyrtp) { return (d->earlyrtp ? -1 : 0); /* Tell asterisk to provide inband signalling if rtp started */
break;
}
return -1; /* Tell asterisk to provide inband signalling */
case AST_CONTROL_BUSY: case AST_CONTROL_BUSY:
if (ast->_state != AST_STATE_UP) { setsubstate_busy(sub);
if (!d->earlyrtp) { return (d->earlyrtp ? -1 : 0); /* Tell asterisk to provide inband signalling if rtp started */
transmit_start_tone(d, SKINNY_BUSYTONE, l->instance, sub->callid);
}
transmit_callstate(d, sub->parent->instance, sub->callid, SKINNY_BUSY);
sub->alreadygone = 1;
ast_softhangup_nolock(ast, AST_SOFTHANGUP_DEV);
if (!d->earlyrtp) {
break;
}
}
return -1; /* Tell asterisk to provide inband signalling */
case AST_CONTROL_CONGESTION: case AST_CONTROL_CONGESTION:
if (ast->_state != AST_STATE_UP) { if (ast->_state != AST_STATE_UP) {
if (!d->earlyrtp) { if (!d->earlyrtp) {
@@ -4839,6 +4828,25 @@ static void setsubstate_connected(struct skinny_subchannel *sub)
l->activesub = sub; l->activesub = sub;
} }
static void setsubstate_busy(struct skinny_subchannel *sub)
{
struct skinny_line *l = sub->parent;
struct skinny_device *d = l->device;
if (sub->substate != SUBSTATE_DIALING) {
ast_log(LOG_WARNING, "Cannot set substate to SUBSTATE_BUSY from %s (on call-%d)\n", substate2str(sub->substate), sub->callid);
return;
}
if (!d->earlyrtp) {
transmit_start_tone(d, SKINNY_BUSYTONE, l->instance, sub->callid);
}
transmit_callinfo(sub);
transmit_callstate(d, sub->parent->instance, sub->callid, SKINNY_BUSY);
transmit_displaypromptstatus(d, "Busy", 0, l->instance, sub->callid);
sub->substate = SUBSTATE_BUSY;
}
static int skinny_hold(struct skinny_subchannel *sub) static int skinny_hold(struct skinny_subchannel *sub)
{ {
struct skinny_line *l = sub->parent; struct skinny_line *l = sub->parent;