From a09da00b0a0fc70ac70d4a33aa936f2aba712b04 Mon Sep 17 00:00:00 2001 From: Matthew Fredrickson Date: Mon, 8 Feb 2010 22:14:17 +0000 Subject: [PATCH] Make sure we set the l3initiated flag when PTP links are attempted to be re-established git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.4@1470 2fbb986a-6c06-0410-b554-c9c1f0a7f128 --- q921.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/q921.c b/q921.c index 33e7d01..906fefa 100644 --- a/q921.c +++ b/q921.c @@ -239,7 +239,9 @@ static void reschedule_t200(struct pri *pri) { 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 @@ static int q921_mdl_handle_ptp_error(struct pri *pri, char error) 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;