From dcca8f345fa55b146fe6b0930df18b226809cc70 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Fri, 19 Jan 2007 18:06:03 +0000 Subject: Merged revisions 51311 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51311 | russell | 2007-01-19 11:49:38 -0600 (Fri, 19 Jan 2007) | 23 lines Merge the changes from the /team/group/vldtmf_fixup branch. The main bug being addressed here is a problem introduced when two SIP channels using SIP INFO dtmf have their media directly bridged. So, when a DTMF END frame comes into Asterisk from an incoming INFO message, Asterisk would try to emulate a digit of some length by first sending a DTMF BEGIN frame and sending a DTMF END later timed off of incoming audio. However, since there was no audio coming in, the DTMF_END was never generated. This caused DTMF based features to no longer work. To fix this, the core now knows when a channel doesn't care about DTMF BEGIN frames (such as a SIP channel sending INFO dtmf). If this is the case, then Asterisk will not emulate a digit of some length, and will instead just pass through the single DTMF END event. Channel drivers also now get passed the length of the digit to their digit_end callback. This improves SIP INFO support even further by enabling us to put the real digit duration in the INFO message instead of a hard coded 250ms. Also, for an incoming INFO message, the duration is read from the frame and passed into the core instead of just getting ignored. (issue #8597, maybe others...) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51314 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_local.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'channels/chan_local.c') diff --git a/channels/chan_local.c b/channels/chan_local.c index b8d112bcd..8d96327bf 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -68,7 +68,7 @@ static const char tdesc[] = "Local Proxy Channel Driver"; static struct ast_channel *local_request(const char *type, int format, void *data, int *cause); static int local_digit_begin(struct ast_channel *ast, char digit); -static int local_digit_end(struct ast_channel *ast, char digit); +static int local_digit_end(struct ast_channel *ast, char digit, unsigned int duration); static int local_call(struct ast_channel *ast, char *dest, int timeout); static int local_hangup(struct ast_channel *ast); static int local_answer(struct ast_channel *ast); @@ -368,7 +368,7 @@ static int local_digit_begin(struct ast_channel *ast, char digit) return res; } -static int local_digit_end(struct ast_channel *ast, char digit) +static int local_digit_end(struct ast_channel *ast, char digit, unsigned int duration) { struct local_pvt *p = ast->tech_pvt; int res = -1; @@ -381,6 +381,7 @@ static int local_digit_end(struct ast_channel *ast, char digit) ast_mutex_lock(&p->lock); isoutbound = IS_OUTBOUND(ast, p); f.subclass = digit; + f.len = duration; res = local_queue_frame(p, isoutbound, &f, ast); ast_mutex_unlock(&p->lock); -- cgit v1.2.3