From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 15 Nov 2016 17:22:34 +0000 (-0500)
Subject: pimd: Allow 'ip pim rp ...' config after bringup
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~91
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e30a4d4afe1027f2b129597410bafc4c159ed834;p=mirror%2Ffrr.git

pimd: Allow 'ip pim rp ...' config after bringup

If you specified the 'ip pim rp ...' after the
system has been configured it was not accepting
the new rp.  This fixes that issue.

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

diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c
index abc06b4eff..1181cea819 100644
--- a/pimd/pim_rp.c
+++ b/pimd/pim_rp.c
@@ -489,6 +489,9 @@ pim_rp_setup (void)
 
   for (ALL_LIST_ELEMENTS_RO (qpim_rp_list, node, rp_info))
     {
+      if (rp_info->rp.rpf_addr.u.prefix4.s_addr == INADDR_NONE)
+        continue;
+
       if (pim_nexthop_lookup (&rp_info->rp.source_nexthop, rp_info->rp.rpf_addr.u.prefix4, 1) != 0)
         {
 	  if (PIM_DEBUG_PIM_TRACE)