From b76d6e718e0f28d1ce7fcd23df57979c3e5abb49 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 9 Nov 2016 08:30:04 -0500 Subject: [PATCH] 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 --- pimd/pim_macro.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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; } /* -- 2.39.5