From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 11 Aug 2016 11:07:15 +0000 (-0400)
Subject: pimd: Fix register stop timer
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~294
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=79ce47c00d216b1403a80f86ba7e10190532bbac;p=mirror%2Ffrr.git

pimd: Fix register stop timer

1) Ensure Timer is actually off
2) I missread the rfc, when we are in prune state, just send the
register stop.  Do not add the tunnel device yet.

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

diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 9ee0e87004..39f609da28 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -913,6 +913,7 @@ pim_upstream_register_stop_timer (struct thread *t)
 
   up = THREAD_ARG (t);
 
+  THREAD_TIMER_OFF (up->t_rs_timer);
   up->t_rs_timer = NULL;
 
   if (PIM_DEBUG_TRACE)
@@ -940,7 +941,6 @@ pim_upstream_register_stop_timer (struct thread *t)
       ip_hdr.ip_len = htons (20);
       // checksum is broken
       pim_register_send ((uint8_t *)&ip_hdr, sizeof (struct ip), rpg, 1);
-      pim_channel_add_oif (up->channel_oil, pim_regiface, PIM_OIF_FLAG_PROTO_PIM);
       break;
     default:
       break;