From: Donald Sharp <sharpd@cumulusnetwroks.com>
Date: Sat, 23 Jul 2016 07:36:25 +0000 (-0400)
Subject: pimd: Stop leaving pim_register_recv early
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~352
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=7a60249e36d29145154653b45dbf147b6f8ae68c;p=mirror%2Ffrr.git

pimd: Stop leaving pim_register_recv early

When we received a pim_register_recv we were shortcutting
the algorithm to determine what to do when we receive
a register pim message.

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

diff --git a/pimd/pim_register.c b/pimd/pim_register.c
index 480c5e36cf..312e917827 100644
--- a/pimd/pim_register.c
+++ b/pimd/pim_register.c
@@ -320,12 +320,6 @@ pim_register_recv (struct interface *ifp,
 	pim_upstream_switch (upstream, PIM_UPSTREAM_PRUNE);
       }
 
-    if (upstream->join_state == PIM_UPSTREAM_PRUNE)
-      {
-	pim_register_stop_send (ifp, &sg, src_addr);
-	return 1;
-      }
-
     if ((upstream->sptbit == PIM_UPSTREAM_SPTBIT_TRUE) ||
 	((SwitchToSptDesired(&sg)) &&
 	 (inherited_olist(source, group) == NULL))) {