[libpri-commits] mattf: tag 1.4.10.2 r1143 - in /tags/1.4.10.2: ChangeLog q921.c

[SVN commits to the libpri project]

Author: mattf
Date: Mon Sep 28 14:07:01 2009
New Revision: 1143

URL: http://svnview.digium.com/svn/libpri?view=rev&rev=1143
Log:
Changes for 1.4.10.2

Modified:
    tags/1.4.10.2/ChangeLog
    tags/1.4.10.2/q921.c

Modified: tags/1.4.10.2/ChangeLog
URL: http://svnview.digium.com/svn/libpri/tags/1.4.10.2/ChangeLog?view=diff&rev=1143&r1=1142&r2=1143
==============================================================================
--- tags/1.4.10.2/ChangeLog (original)
+++ tags/1.4.10.2/ChangeLog Mon Sep 28 14:07:01 2009
@@ -1,3 +1,11 @@
+2009-04-18 Matthew Fredrickson <creslin at digium.com>
+
+	* libpri 1.4.10.2 released.  A bug was found which was introduced
+	  during the PTMP rewrite, which causes timers to not be cleared
+	  before being set in certain situations.  This can cause the
+	  scheduler to be competely filled, as well as improper Q.921 link
+	  operation.
+
 2009-04-18 Matthew Fredrickson <creslin at digium.com>
 
 	* libpri 1.4.10.1 released.  Includes a fix for a regression found in

Modified: tags/1.4.10.2/q921.c
URL: http://svnview.digium.com/svn/libpri/tags/1.4.10.2/q921.c?view=diff&rev=1143&r1=1142&r2=1143
==============================================================================
--- tags/1.4.10.2/q921.c (original)
+++ tags/1.4.10.2/q921.c Mon Sep 28 14:07:01 2009
@@ -798,6 +798,16 @@
 	if (pri->debug & PRI_DEBUG_Q921_STATE && pri->q921_state != Q921_LINK_CONNECTION_ESTABLISHED)
 		pri_message(pri, DBGHEAD "q921_state now is Q921_LINK_CONNECTION_ESTABLISHED\n", DBGINFO);
 	pri->q921_state = Q921_LINK_CONNECTION_ESTABLISHED;
+
+	/* Ensure that we do not have T200 or T203 running when the link comes up */
+	if (pri->t200_timer) {
+		pri_schedule_del(pri, pri->t200_timer);
+		pri->t200_timer = 0;
+	}
+
+	if (pri->t203_timer) {
+		pri_schedule_del(pri, pri->t203_timer);
+	}
 
 	/* Start the T203 timer */
 	pri->t203_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T203], t203_expire, pri);