diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-05-05 03:56:27 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-05-05 03:56:27 +0000 |
| commit | 82a4a4f7fe748214f400e2fc1d07f09b2de5e8b5 (patch) | |
| tree | 50bedd46c02b92d57cdb75d22cc0d8fac61ac493 /rtp.c | |
| parent | 3e1206a87daf290a4ac94c03203b6f42d06308fa (diff) | |
Ignore dupe packets for RFC2833 (bug #1034)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2895 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'rtp.c')
| -rwxr-xr-x | rtp.c | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -43,7 +43,7 @@ #define TYPE_DONTSEND 0x3 #define TYPE_MASK 0x3 -static int dtmftimeout = 300; /* 300 samples */ +static int dtmftimeout = 3000; /* 3000 samples */ static int rtpstart = 0; static int rtpend = 0; @@ -68,6 +68,7 @@ struct ast_rtp { unsigned int lastrxts; unsigned int lastividtimestamp; unsigned int lastovidtimestamp; + unsigned int lasteventseqn; int lasttxformat; int lastrxformat; int dtmfcount; @@ -449,11 +450,17 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp) // This is special in-band data that's not one of our codecs if (rtpPT.code == AST_RTP_DTMF) { /* It's special -- rfc2833 process it */ - f = process_rfc2833(rtp, rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen, res - hdrlen); + if (rtp->lasteventseqn <= seqno) { + f = process_rfc2833(rtp, rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen, res - hdrlen); + rtp->lasteventseqn = seqno; + } if (f) return f; else return &null_frame; } else if (rtpPT.code == AST_RTP_CISCO_DTMF) { /* It's really special -- process it the Cisco way */ - f = process_cisco_dtmf(rtp, rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen, res - hdrlen); + if (rtp->lasteventseqn <= seqno) { + f = process_cisco_dtmf(rtp, rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen, res - hdrlen); + rtp->lasteventseqn = seqno; + } if (f) return f; else return &null_frame; } else if (rtpPT.code == AST_RTP_CN) { /* Comfort Noise */ |