diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-06 21:08:54 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-06 21:08:54 +0000 |
| commit | 0da868c687cfa2f43fbd90303d22950213a5cdc2 (patch) | |
| tree | c0bd29c757d73166aeeceddbcfdee7662f9448f5 /main | |
| parent | 0a6b5fe957a5172eeae047ca658885a253277c26 (diff) | |
Remove the seqno check for RFC2833, the handler is smart enough to not need it.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@44628 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/rtp.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/main/rtp.c b/main/rtp.c index 66f2307ae..23c4bbe46 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -1177,10 +1177,6 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp) ast_verbose("Got RTP packet from %s:%d (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u)\n", ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), payloadtype, seqno, timestamp,res - hdrlen); - /* When the seqno starts over we need to reset the seqno for DTMF */ - if (seqno == 0) - rtp->lasteventseqn = 0; - rtpPT = ast_rtp_lookup_pt(rtp, payloadtype); if (!rtpPT.isAstFormat) { struct ast_frame *f = NULL; @@ -1203,10 +1199,7 @@ struct ast_frame *ast_rtp_read(struct ast_rtp *rtp) duration &= 0xFFFF; ast_verbose("Got RTP RFC2833 from %s:%d (type %-2.2d, seq %-6.6u, ts %-6.6u, len %-6.6u, mark %d, event %08x, end %d, duration %-5.5d) \n", ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port), payloadtype, seqno, timestamp, res - hdrlen, (mark?1:0), event, ((event_end & 0x80)?1:0), duration); } - if (rtp->lasteventseqn <= seqno || (rtp->lasteventseqn >= 65530 && seqno <= 6)) { - f = process_rfc2833(rtp, rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen, res - hdrlen, seqno); - rtp->lasteventseqn = seqno; - } + f = process_rfc2833(rtp, rtp->rawdata + AST_FRIENDLY_OFFSET + hdrlen, res - hdrlen, seqno); } else if (rtpPT.code == AST_RTP_CISCO_DTMF) { /* It's really special -- process it the Cisco way */ if (rtp->lasteventseqn <= seqno || (rtp->lasteventseqn >= 65530 && seqno <= 6)) { |