[svn-commits] mattf: branch 1.4 r1470 - /branches/1.4/q921.c

[SVN commits to the Digium repositories]

Author: mattf
Date: Mon Feb  8 16:14:17 2010
New Revision: 1470

URL: http://svnview.digium.com/svn/libpri?view=rev&rev=1470
Log:
Make sure we set the l3initiated flag when PTP links are attempted to be re-established

Modified:
    branches/1.4/q921.c

Modified: branches/1.4/q921.c
URL: http://svnview.digium.com/svn/libpri/branches/1.4/q921.c?view=diff&rev=1470&r1=1469&r2=1470
==============================================================================
--- branches/1.4/q921.c (original)
+++ branches/1.4/q921.c Mon Feb  8 16:14:17 2010
@@ -239,7 +239,9 @@
 {
 	if (pri->debug & PRI_DEBUG_Q921_DUMP)
 		pri_message(pri, "-- Restarting T200 timer\n");
-	pri_schedule_del(pri, pri->t200_timer);
+
+	if (pri->t200_timer)
+		pri_schedule_del(pri, pri->t200_timer);
 	pri->t200_timer = pri_schedule_event(pri, pri->timers[PRI_TIMER_T200], t200_expire, pri);
 }
 
@@ -1201,6 +1203,7 @@
 		q921_discard_iqueue(pri);
 		q921_establish_data_link(pri);
 		q921_setstate(pri, Q921_AWAITING_ESTABLISHMENT);
+		pri->l3initiated = 1;
 
 		pri->schedev = 1;
 		pri->ev.gen.e = PRI_EVENT_DCHAN_DOWN;