From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Fri, 11 Nov 2016 02:08:48 +0000 (-0500)
Subject: pimd: Add (-) PRUNE(S,G,rpt) from interface determination.
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~104
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=46c8aab88af4aa4ab2aca68ee854aed43227260f;p=matthieu%2Ffrr.git

pimd: Add (-) PRUNE(S,G,rpt) from interface determination.

When determining the inherited_olist(S,G) add
the determination that we have received a
prune(S,G,rpt) from a neighbor.

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

diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 8552966782..2596f8c6e1 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -658,7 +658,11 @@ pim_upstream_evaluate_join_desired_interface (struct pim_upstream *up,
     {
       if (!pim_macro_ch_lost_assert(ch) && pim_macro_chisin_joins_or_include(ch))
 	return 1;
+
+      if (PIM_IF_FLAG_TEST_S_G_RPT(ch->flags))
+	return 0;
     }
+
   /*
    * joins (*,G)
    */