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

fix an issue with dtmf not being sent sometimes

Browse Source 
slightly modify handling of digits


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35032 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
North Antara
2006-06-20 08:09:30 +00:00
parent a3846a727c
commit fb0bb9b195
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
channels/chan_skinny.c
View File

@@ -2254,7 +2254,12 @@ static int skinny_answer(struct ast_channel *ast)
if (ast->_state != AST_STATE_UP) { if (ast->_state != AST_STATE_UP) {
ast_setstate(ast, AST_STATE_UP); ast_setstate(ast, AST_STATE_UP);
} }
transmit_tone(s, SKINNY_SILENCE); transmit_tone(s, SKINNY_SILENCE);
/* order matters here...
for some reason, transmit_callinfo must be before transmit_callstate,
or you won't get keypad messages in some situations. */
transmit_callinfo(s, ast->cid.cid_name, ast->cid.cid_num, ast->exten, ast->exten, l->instance, sub->callid, 2);
transmit_callstate(s, l->instance, SKINNY_CONNECTED, sub->callid); transmit_callstate(s, l->instance, SKINNY_CONNECTED, sub->callid);
transmit_displaypromptstatus(s, "Connected", 0, l->instance, sub->callid); transmit_displaypromptstatus(s, "Connected", 0, l->instance, sub->callid);
return res; return res;
@@ -2602,8 +2607,9 @@ static int handle_keypad_button_message(skinny_req *req, struct skinnysession *s
{ {
struct skinny_subchannel *sub = NULL; struct skinny_subchannel *sub = NULL;
struct skinny_line *l; struct skinny_line *l;
struct skinny_device *d = s->device;
struct ast_frame f = { 0, }; struct ast_frame f = { 0, };
char d; char dgt;
int digit; int digit;
int lineInstance; int lineInstance;
int callReference; int callReference;
@@ -2613,11 +2619,11 @@ static int handle_keypad_button_message(skinny_req *req, struct skinnysession *s
callReference = letohl(req->data.keypad.callReference); callReference = letohl(req->data.keypad.callReference);
f.frametype = AST_FRAME_DTMF; f.frametype = AST_FRAME_DTMF;
if (digit == 14) { if (digit == 14) {
d = '*'; dgt = '*';
} else if (digit == 15) { } else if (digit == 15) {
d = '#'; dgt = '#';
} else if (digit >=0 && digit <= 9) { } else if (digit >=0 && digit <= 9) {
d = '0' + digit; dgt = '0' + digit;
} else { } else {
/* digit=10-13 (A,B,C,D ?), or /* digit=10-13 (A,B,C,D ?), or
* digit is bad value * digit is bad value
@@ -2626,14 +2632,16 @@ static int handle_keypad_button_message(skinny_req *req, struct skinnysession *s
* value for backward compatibility, and log * value for backward compatibility, and log
* a warning. * a warning.
*/ */
d = '0' + digit; dgt = '0' + digit;
ast_log(LOG_WARNING, "Unsupported digit %d\n", digit); ast_log(LOG_WARNING, "Unsupported digit %d\n", digit);
} }
f.subclass = d; f.subclass = dgt;
f.src = "skinny"; f.src = "skinny";
if (lineInstance && callReference) if (lineInstance && callReference)
sub = find_subchannel_by_instance_reference(s->device, lineInstance, callReference); sub = find_subchannel_by_instance_reference(d, lineInstance, callReference);
else
sub = find_subchannel_by_instance_reference(d, d->lastlineinstance, d->lastcallreference);
if (!sub) if (!sub)
return 0; return 0;