From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 22 Jun 2017 16:58:02 +0000 (-0400)
Subject: pimd: Set sptbit when we send the register stop
X-Git-Tag: frr-4.0-dev~468^2~33
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=df766618e2761705fc039d8cf81544c072d7fbd0;p=mirror%2Ffrr.git

pimd: Set sptbit when we send the register stop

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

diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index 0e0a275155..9a76b88edb 100644
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -481,10 +481,12 @@ static int pim_mroute_msg_wrvifwhole(int fd, struct interface *ifp,
 			// No if channel, but upstream we are at the RP.
 			if (pim_nexthop_lookup(pim_ifp->pim, &source,
 					       up->upstream_register, 0)
-			    == 0)
+			    == 0) {
 				pim_register_stop_send(source.interface, &sg,
 						       pim_ifp->primary_address,
 						       up->upstream_register);
+				up->sptbit = PIM_UPSTREAM_SPTBIT_TRUE;
+			}
 			if (!up->channel_oil)
 				up->channel_oil = pim_channel_oil_add(
 					pim_ifp->pim, &sg,
@@ -493,7 +495,6 @@ static int pim_mroute_msg_wrvifwhole(int fd, struct interface *ifp,
 			if (!up->channel_oil->installed)
 				pim_mroute_add(up->channel_oil,
 					       __PRETTY_FUNCTION__);
-			pim_upstream_set_sptbit(up, ifp);
 		} else {
 			if (I_am_RP(pim_ifp->pim, up->sg.grp)) {
 				if (pim_nexthop_lookup(pim_ifp->pim, &source,