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 e6eb462b77ab3460d1e8cea9f35606a67aabb0dd..22da24da4a95b44def45e8e2bbb365a20fd0f0c1 100644 (file)
--- 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);
 }
 
 /*