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 8552966782450e62f29fd8043fef803e9ecce0a0..2596f8c6e1b57149ad857ac3745c13b067e5d79a 100644 (file)
--- 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)
    */