]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Update some old logic to stop both begin and end DTMF frames from reaching the core...
authorJoshua Colp <jcolp@digium.com>
Wed, 6 May 2009 13:30:51 +0000 (13:30 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 6 May 2009 13:30:51 +0000 (13:30 +0000)
(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.4@192633 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

index 82d47d2fb86a17ef30f81e9edd7b010769ba1027..baec6e3028d19f71a1fce268d4689d621c865a1a 100644 (file)
@@ -4404,9 +4404,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_log(LOG_DEBUG,"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))