diff options
| author | Donald Sharp <sharpd@cumulusnetwroks.com> | 2016-07-29 21:02:17 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-12-21 20:26:04 -0500 |
| commit | 978d48a9fe6c8ad23fa8500631c4ffac0b0c7c9c (patch) | |
| tree | 1151ec9c329697cacf9f5c53cac9d22ef3cd2523 /pimd/pim_macro.c | |
| parent | 1a10fc742fcdb05024be3721b7641e19107edad7 (diff) | |
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>
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); } /* |