[asterisk-commits] lmadsen: tag 1.6.2.10-rc2 r274536 - in /tags/1.6.2.10-rc2: ./ main/

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Wed Jul  7 10:23:09 2010
New Revision: 274536

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=274536
Log:
Merge changes from revision 274168, update ChangeLog and .version files.

Modified:
    tags/1.6.2.10-rc2/.version
    tags/1.6.2.10-rc2/ChangeLog
    tags/1.6.2.10-rc2/main/rtp.c

Modified: tags/1.6.2.10-rc2/.version
URL: http://svnview.digium.com/svn/asterisk/tags/1.6.2.10-rc2/.version?view=diff&rev=274536&r1=274535&r2=274536
==============================================================================
--- tags/1.6.2.10-rc2/.version (original)
+++ tags/1.6.2.10-rc2/.version Wed Jul  7 10:23:09 2010
@@ -1,1 +1,1 @@
-1.6.2.10-rc1
+1.6.2.10-rc2

Modified: tags/1.6.2.10-rc2/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/1.6.2.10-rc2/ChangeLog?view=diff&rev=274536&r1=274535&r2=274536
==============================================================================
--- tags/1.6.2.10-rc2/ChangeLog (original)
+++ tags/1.6.2.10-rc2/ChangeLog Wed Jul  7 10:23:09 2010
@@ -1,3 +1,22 @@
+2010-07-07  Leif Madsen <lmadsen at digium.com>
+
+	* Release Asterisk 1.6.2.10-rc2
+
+	* Fix problem with RFC 2833 DTMF not being accepted.
+  
+	  A recent check was added to ensure that we did not erroneously
+	  detect duplicate DTMF when we received packets out of order.
+	  The problem was that the check did not account for the fact that
+	  the seqno of an RTP stream will roll over back to 0 after hitting
+	  65535. Now, we have a secondary check that will ensure that the
+	  seqno rolling over will not cause us to stop accepting DTMF.
+  
+	    (closes issue 0017571)
+	    Reported by: mdeneen
+	    Patches:
+	          rtp_seqno_rollover.patch uploaded by mmichelson (license 60)
+	    Tested by: richardf, maxochoa, JJCinAZ
+
 2010-06-29  Leif Madsen <lmadsen at digium.com>
 
 	* Release Asterisk 1.6.2.10-rc1

Modified: tags/1.6.2.10-rc2/main/rtp.c
URL: http://svnview.digium.com/svn/asterisk/tags/1.6.2.10-rc2/main/rtp.c?view=diff&rev=274536&r1=274535&r2=274536
==============================================================================
--- tags/1.6.2.10-rc2/main/rtp.c (original)
+++ tags/1.6.2.10-rc2/main/rtp.c Wed Jul  7 10:23:09 2010
@@ -1072,8 +1072,11 @@
 		if (last_duration > 64000 && samples < last_duration)
 			new_duration += 0xFFFF + 1;
 		new_duration = (new_duration & ~0xFFFF) | samples;
-
-		if (rtp->lastevent > seqno) {
+		/* The second portion of this check is to not mistakenly
+		 * stop accepting DTMF if the seqno rolls over beyond
+		 * 65535.
+		 */
+		if (rtp->lastevent > seqno && rtp->lastevent - seqno < 50) {
 			/* Out of order frame. Processing this can cause us to
 			 * improperly duplicate incoming DTMF, so just drop
 			 * this.