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

It was pointed out to me, that using two frames is silly.

Browse Source 
Thanks Josh.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41790 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2006-09-02 01:44:50 +00:00
parent 1d9bf5b1e8
commit ce35c33353
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
channels/chan_skinny.c
View File

@@ -2760,16 +2760,12 @@ 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 skinny_device *d = s->device;
struct ast_frame fb = { 0, }; struct ast_frame f = { 0, };
struct ast_frame fe = { 0, };
char dgt; char dgt;
int digit; int digit;
int lineInstance; int lineInstance;
int callReference; int callReference;
fb.frametype = AST_FRAME_DTMF_BEGIN;
fe.frametype = AST_FRAME_DTMF_END;
digit = letohl(req->data.keypad.button); digit = letohl(req->data.keypad.button);
lineInstance = letohl(req->data.keypad.lineInstance); lineInstance = letohl(req->data.keypad.lineInstance);
callReference = letohl(req->data.keypad.callReference); callReference = letohl(req->data.keypad.callReference);
@@ -2792,11 +2788,9 @@ static int handle_keypad_button_message(skinny_req *req, struct skinnysession *s
ast_log(LOG_WARNING, "Unsupported digit %d\n", digit); ast_log(LOG_WARNING, "Unsupported digit %d\n", digit);
} }
fb.subclass = dgt; f.subclass = dgt;
fe.subclass = dgt;
fb.src = "skinny"; f.src = "skinny";
fe.src = "skinny";
if (lineInstance && callReference) if (lineInstance && callReference)
sub = find_subchannel_by_instance_reference(d, lineInstance, callReference); sub = find_subchannel_by_instance_reference(d, lineInstance, callReference);
@@ -2809,16 +2803,20 @@ static int handle_keypad_button_message(skinny_req *req, struct skinnysession *s
l = sub->parent; l = sub->parent;
if (sub->owner) { if (sub->owner) {
if (sub->owner->_state == 0) { if (sub->owner->_state == 0) {
ast_queue_frame(sub->owner, &fb); f.frametype = AST_FRAME_DTMF_BEGIN;
ast_queue_frame(sub->owner, &f);
} }
/* XXX MUST queue this frame to all lines in threeway call if threeway call is active */ /* XXX MUST queue this frame to all lines in threeway call if threeway call is active */
ast_queue_frame(sub->owner, &fe); f.frametype = AST_FRAME_DTMF_END;
ast_queue_frame(sub->owner, &f);
/* XXX This seriously needs to be fixed */ /* XXX This seriously needs to be fixed */
if (sub->next && sub->next->owner) { if (sub->next && sub->next->owner) {
if (sub->owner->_state == 0) { if (sub->owner->_state == 0) {
ast_queue_frame(sub->next->owner, &fb); f.frametype = AST_FRAME_DTMF_BEGIN;
ast_queue_frame(sub->next->owner, &f);
} }
ast_queue_frame(sub->next->owner, &fe); f.frametype = AST_FRAME_DTMF_END;
ast_queue_frame(sub->next->owner, &f);
} }
} else { } else {
if (skinnydebug) if (skinnydebug)