[asterisk-commits] file: branch 1.6.1 r192636 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: file
Date: Wed May  6 08:37:15 2009
New Revision: 192636

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=192636
Log:
Merged revisions 192634 via svnmerge from 
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)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=192636&r1=192635&r2=192636
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Wed May  6 08:37:15 2009
@@ -6077,9 +6077,11 @@
 		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))