From 5c777da81f64ad892f0fde969d7e7bc099d36be8 Mon Sep 17 00:00:00 2001 From: saravanank Date: Tue, 17 Mar 2020 02:28:18 -0700 Subject: [PATCH] pimd: (*, G) Prune should be processed even if the RP in packet is not RP(G) RCA: We are ignoring (*,G) prune when the RP in packet is not RP(G) Fix: According to RFC 4601 Section 4.5.2: Received Prune(*,G) messages are processed even if the RP in the message does not match RP(G). We have allowed starg prune to be processed in the scenario. Signed-off-by: Saravanan K --- pimd/pim_join.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pimd/pim_join.c b/pimd/pim_join.c index 62bd2360c3..3a88de2070 100644 --- a/pimd/pim_join.c +++ b/pimd/pim_join.c @@ -140,18 +140,19 @@ static void recv_prune(struct interface *ifp, struct pim_neighbor *neigh, if ((source_flags & PIM_RPT_BIT_MASK) && (source_flags & PIM_WILDCARD_BIT_MASK)) { - struct pim_rpf *rp = RP(pim_ifp->pim, sg->grp); + /* + * RFC 4601 Section 4.5.2: + * Received Prune(*,G) messages are processed even if the + * RP in the message does not match RP(G). + */ + if (PIM_DEBUG_PIM_TRACE) { + char received_rp[INET_ADDRSTRLEN]; - if (!rp) { - if (PIM_DEBUG_PIM_TRACE) - zlog_debug( - "%s: RP for %pSG4 completely failed lookup", - __func__, sg); - return; + pim_inet4_dump("", sg->src, received_rp, + sizeof(received_rp)); + zlog_debug("%s: Prune received with RP(%s) for %pSG4", + __func__, received_rp, sg); } - // Ignoring Prune *,G's at the moment. - if (sg->src.s_addr != rp->rpf_addr.u.prefix4.s_addr) - return; sg->src.s_addr = INADDR_ANY; }