From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 9 Nov 2016 13:30:04 +0000 (-0500)
Subject: pimd: Modify downstream JP state to take into account all states
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~112
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=b76d6e718e0f28d1ce7fcd23df57979c3e5abb49;p=matthieu%2Ffrr.git

pimd: Modify downstream JP state to take into account all states

When we make a decision about downstream state let's
take into account all states.

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

diff --git a/pimd/pim_macro.c b/pimd/pim_macro.c
index 177de66673..da12146be1 100644
--- a/pimd/pim_macro.c
+++ b/pimd/pim_macro.c
@@ -42,7 +42,20 @@
 */
 static int downstream_jpstate_isjoined(const struct pim_ifchannel *ch)
 {
-  return (ch->ifjoin_state != PIM_IFJOIN_NOINFO);
+  switch (ch->ifjoin_state)
+    {
+    case PIM_IFJOIN_NOINFO:
+    case PIM_IFJOIN_PRUNE:
+    case PIM_IFJOIN_PRUNE_TMP:
+    case PIM_IFJOIN_PRUNE_PENDING_TMP:
+      return 0;
+     break;
+    case PIM_IFJOIN_JOIN:
+    case PIM_IFJOIN_PRUNE_PENDING:
+      return 1;
+      break;
+    }
+  return 0;
 }
 
 /*