]> git.puffer.fish Git - mirror/frr.git/commitdiff
pimd: Fix test for (S,G,rpt) prune inclusion.
authorDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 3 Nov 2016 19:44:24 +0000 (15:44 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Thu, 22 Dec 2016 01:26:13 +0000 (20:26 -0500)
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>
pimd/pim_msg.c

index 12a043b650890511785e9e072279e517f6a8be88..1ae039e1c259003f30ad9958d91e98ec5bdcfb66 100644 (file)
@@ -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));