diff options
author | Mark Spencer <markster@digium.com> | 2004-11-17 19:04:48 +0000 |
---|---|---|
committer | Mark Spencer <markster@digium.com> | 2004-11-17 19:04:48 +0000 |
commit | c75879d64abbc7233a53d4f69f75c8e166226e9a (patch) | |
tree | 47626705a907577f7baefac7e85dc78e7de81651 /rtp.c | |
parent | 0e5ecf4a0d89cfe0dea79eb0c61a560c980f5031 (diff) |
Revised seqno fix (bug #2887)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4281 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'rtp.c')
-rwxr-xr-x | rtp.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -79,7 +79,7 @@ struct ast_rtp { unsigned int lastrxts; unsigned int lastividtimestamp; unsigned int lastovidtimestamp; - unsigned int lasteventtimestamp; + unsigned int lasteventseqn; int lasttxformat; int lastrxformat; int dtmfcount; @@ -490,16 +490,16 @@ 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 */ - if (rtp->lasteventtimestamp <= timestamp) { + if (rtp->lasteventseqn <= seqno || rtp->resp == 0 || (rtp->lasteventseqn >= 65530 && seqno <= 6)) { f = process_rfc2833(rtp, rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen, res - hdrlen); - rtp->lasteventtimestamp = timestamp; + rtp->lasteventseqn = seqno; } else f = NULL; 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 */ - if (rtp->lasteventtimestamp <= timestamp) { + if (rtp->lasteventseqn <= seqno || rtp->resp == 0 || (rtp->lasteventseqn >= 65530 && seqno <= 6)) { f = process_cisco_dtmf(rtp, rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen, res - hdrlen); - rtp->lasteventtimestamp = timestamp; + rtp->lasteventseqn = seqno; } else f = NULL; if (f) return f; else return &null_frame; } else if (rtpPT.code == AST_RTP_CN) { |