From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 18 Jul 2016 13:52:45 +0000 (-0400)
Subject: pimd: Properly initialize and delete t_rs_timer
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~376
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=792f4d29adabe9679de8088869d32d623ffadaa5;p=matthieu%2Ffrr.git

pimd: Properly initialize and delete t_rs_timer

Ensure that we properly initialize and stop the t_rs_timer.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

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;