[asterisk-commits] file: trunk r44630 - in /trunk: ./ main/rtp.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Fri Oct  6 16:10:42 2006
New Revision: 44630

URL: http://svn.digium.com/view/asterisk?rev=44630&view=rev
Log:
Merged revisions 44628 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44628 | file | 2006-10-06 17:08:54 -0400 (Fri, 06 Oct 2006) | 2 lines

Remove the seqno check for RFC2833, the handler is smart enough to not need it.

........

Modified:
    trunk/   (props changed)
    trunk/main/rtp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?rev=44630&r1=44629&r2=44630&view=diff
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Fri Oct  6 16:10:42 2006
@@ -1234,10 +1234,6 @@
 		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;
@@ -1260,10 +1256,7 @@
 				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)) {