diff options
Diffstat (limited to 'pimd/pim_macro.c')
| -rw-r--r-- | pimd/pim_macro.c | 7 |
1 files changed, 5 insertions, 2 deletions
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); } /* |