From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 18 Aug 2016 00:44:51 +0000 (-0400)
Subject: pimd: Fix RP handling of Register message
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~285
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=00d2f9e45b953f0f710cc0a14cc9dac5205acedc;p=matthieu%2Ffrr.git

pimd: Fix RP handling of Register message

The RP needs to send the join when we want to send it

Also make sure the ka_timer is reset properly.

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

diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index da1a1c7666..8d908b719e 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -191,8 +191,6 @@ pim_upstream_send_join (struct pim_upstream *up)
   if (up->fhr)
     return;
 
-  zassert(up->join_state == PIM_UPSTREAM_JOINED);
-  
   /* send Join(S,G) to the current upstream neighbor */
   pim_joinprune_send(up->rpf.source_nexthop.interface,
   		     up->rpf.rpf_addr,
@@ -854,6 +852,7 @@ void
 pim_upstream_keep_alive_timer_start (struct pim_upstream *up,
 				     uint32_t time)
 {
+  THREAD_OFF (up->t_ka_timer);
   THREAD_TIMER_ON (master,
 		   up->t_ka_timer,
 		   pim_upstream_keep_alive_timer,