From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 3 Nov 2016 19:44:24 +0000 (-0400)
Subject: pimd: Fix test for (S,G,rpt) prune inclusion.
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~132
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=07d6bab3f2ab8919202c63c87df52b864d7ff321;p=mirror%2Ffrr.git

pimd: Fix test for (S,G,rpt) prune inclusion.

The (S,G,rpt) prune inclusion was incorrectly considering
if the RPF' was the same for (S,G) and (*,G).

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

diff --git a/pimd/pim_msg.c b/pimd/pim_msg.c
index 12a043b650..1ae039e1c2 100644
--- a/pimd/pim_msg.c
+++ b/pimd/pim_msg.c
@@ -218,7 +218,7 @@ pim_msg_join_prune_encode (uint8_t *buf, int buf_size, int is_join,
 	{
 	  if (child->sptbit == PIM_UPSTREAM_SPTBIT_TRUE)
 	    {
-	      if (pim_rpf_is_same(&up->rpf, &child->rpf))
+	      if (!pim_rpf_is_same(&up->rpf, &child->rpf))
 		{
 		  zlog_debug ("%s: SPT Bit and RPF'(%s) != RPF'(S,G): Add Prune (%s,rpt) to compound message",
 			      __PRETTY_FUNCTION__, star_g, pim_str_sg_dump (&child->sg));