From 792f4d29adabe9679de8088869d32d623ffadaa5 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Mon, 18 Jul 2016 09:52:45 -0400 Subject: [PATCH] pimd: Properly initialize and delete t_rs_timer Ensure that we properly initialize and stop the t_rs_timer. Signed-off-by: Donald Sharp --- pimd/pim_upstream.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index 066fbc4721..87f6089b28 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -68,6 +68,7 @@ void pim_upstream_delete(struct pim_upstream *up) { THREAD_OFF(up->t_join_timer); THREAD_OFF(up->t_ka_timer); + THREAD_OFF(up->t_rs_timer); upstream_channel_oil_detach(up); @@ -379,6 +380,7 @@ static struct pim_upstream *pim_upstream_new(struct in_addr source_addr, up->ref_count = 1; up->t_join_timer = NULL; up->t_ka_timer = NULL; + up->t_rs_timer = NULL; up->join_state = 0; up->state_transition = pim_time_monotonic_sec(); up->channel_oil = NULL; -- 2.39.5