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

Merged revisions 192634 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r192634 | file | 2009-05-06 10:34:35 -0300 (Wed, 06 May 2009) | 14 lines
  
  Merged revisions 192633 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r192633 | file | 2009-05-06 10:30:51 -0300 (Wed, 06 May 2009) | 7 lines
    
    Update some old logic to stop both begin and end DTMF frames from reaching the core if rfc2833 is not enabled.
    
    (closes issue #15036)
    Reported by: dimas
    Patches:
          v1-15036.patch uploaded by dimas (license 88)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@192635 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2009-05-06 13:36:19 +00:00
parent b516cf9b81
commit 2f3e7752f2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_sip.c
View File

@@ -5800,9 +5800,11 @@ static struct ast_frame *sip_rtp_read(struct ast_channel *ast, struct sip_pvt *p
f = &ast_null_frame;
}
/* Don't forward RFC2833 if we're not supposed to */
if (f && (f->frametype == AST_FRAME_DTMF) &&
(ast_test_flag(&p->flags[0], SIP_DTMF) != SIP_DTMF_RFC2833))
if (f && (f->frametype == AST_FRAME_DTMF_BEGIN || f->frametype == AST_FRAME_DTMF_END) &&
(ast_test_flag(&p->flags[0], SIP_DTMF) != SIP_DTMF_RFC2833)) {
ast_debug(1, "Ignoring DTMF (%c) RTP frame because dtmfmode is not RFC2833\n", f->subclass);
return &ast_null_frame;
}
/* We already hold the channel lock */
if (!p->owner || (f && f->frametype != AST_FRAME_VOICE))