summaryrefslogtreecommitdiffstats
path: root/pimd/pim_macro.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2016-08-19 15:07:19 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2016-12-22 02:26:07 +0100
commit04329d4e498fff314d4b1df571bb509050a23e61 (patch)
tree2f28783335e24e63a179abd1f61d74521599405a /pimd/pim_macro.c
parentpimd: Modify pim_upstream_state2str for more usage (diff)
downloadfrr-04329d4e498fff314d4b1df571bb509050a23e61.tar.xz
frr-04329d4e498fff314d4b1df571bb509050a23e61.zip
pimd: Fix join received when in Prune or Prune Pending
When we are a FHR, and the upstream state is in Prune or Prune Pending allow the join because we know we want to forward traffic to the RP. Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_macro.c')
-rw-r--r--pimd/pim_macro.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pimd/pim_macro.c b/pimd/pim_macro.c
index 62decfd5f..4bcb62a90 100644
--- a/pimd/pim_macro.c
+++ b/pimd/pim_macro.c
@@ -337,7 +337,7 @@ static int pim_macro_chisin_inherited_olist(const struct pim_ifchannel *ch)
*/
int pim_macro_chisin_oiflist(const struct pim_ifchannel *ch)
{
- if (ch->upstream->join_state != PIM_UPSTREAM_JOINED) {
+ if (ch->upstream->join_state == PIM_UPSTREAM_NOTJOINED) {
/* oiflist is NULL */
return 0; /* false */
}