From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 3 Aug 2017 14:56:30 +0000 (-0400)
Subject: pimd: Lookup S,G ifchannel after we create it
X-Git-Tag: frr-4.0-dev~448^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=8e7a4c6e2b8196751e4ab689bc73d064bbee0e03;p=mirror%2Ffrr.git

pimd: Lookup S,G ifchannel after we create it

There are situations where we receive a *,G with
a S,G,RPT Prune embedded where we do not actually
have any S,G yet(MSDP with multiple RP's with the
same address).  As such since we only need to
lookup the S,G ifchannel once, do it after
the recv_prune.

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

diff --git a/pimd/pim_join.c b/pimd/pim_join.c
index 9796f580ce..c60e5a65aa 100644
--- a/pimd/pim_join.c
+++ b/pimd/pim_join.c
@@ -306,14 +306,20 @@ int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh,
 				return -8;
 			}
 
-			sg_ch = pim_ifchannel_find(ifp, &sg);
-
 			buf += addr_offset;
 			starg_alone = 0;
 			recv_prune(ifp, neigh, msg_holdtime,
 				   msg_upstream_addr.u.prefix4, &sg,
 				   msg_source_flags);
 
+			/*
+			 * So if we are receiving a S,G,RPT prune
+			 * before we have any data for that S,G
+			 * We need to retrieve the sg_ch after
+			 * we parse the prune.
+			 */
+			sg_ch = pim_ifchannel_find(ifp, &sg);
+
 			/* Received SG-RPT Prune delete oif from specific S,G */
 			if (starg_ch && sg_ch
 			    && (msg_source_flags & PIM_RPT_BIT_MASK)