From: Donald Sharp <sharpd@cumulusnetwroks.com>
Date: Sat, 30 Jul 2016 01:02:17 +0000 (-0400)
Subject: pimd: Fix DownstreamJPState(S,G,I) check.
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~333
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=978d48a9fe6c8ad23fa8500631c4ffac0b0c7c9c;p=matthieu%2Ffrr.git

pimd: Fix DownstreamJPState(S,G,I) check.

Fix the
DownStreamJPState(S,G,I) and
DownStreamJPState(*,G,I) macros.

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

diff --git a/pimd/pim_macro.c b/pimd/pim_macro.c
index e6eb462b77..22da24da4a 100644
--- a/pimd/pim_macro.c
+++ b/pimd/pim_macro.c
@@ -28,16 +28,19 @@
 #include "pim_str.h"
 #include "pim_iface.h"
 #include "pim_ifchannel.h"
+#include "pim_rp.h"
 
 /*
   DownstreamJPState(S,G,I) is the per-interface state machine for
   receiving (S,G) Join/Prune messages.
 
-  DownstreamJPState(S,G,I) is either Join or Prune-Pending ?
+  DownstreamJPState(S,G,I) is either Join or Prune-Pending
+  DownstreamJPState(*,G,I) is either Join or Prune-Pending
 */
 static int downstream_jpstate_isjoined(const struct pim_ifchannel *ch)
 {
-  return ch->ifjoin_state != PIM_IFJOIN_NOINFO;
+  return (ch->ifjoin_state == PIM_IFJOIN_NOINFO ||
+	  ch->ifjoin_state == PIM_IFJOIN_PRUNE_PENDING);
 }
 
 /*