From 6f0f014f0883ce45340af35090cdad85531a53d2 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 9 Apr 2019 13:20:32 -0400 Subject: [PATCH] pimd: Add JoinDesired(S,G) to deciding to set spt bit The decision for Update_SPTbit(S,G, iif) includes a test for JoinDesired(S,G) in section 4.2.2. When we were deciding to update the spt bit we were not taking this into account. This commit fixes this issue. Signed-off-by: Donald Sharp --- pimd/pim_upstream.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index 2a0804e10b..f1347b7eaf 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -1276,7 +1276,12 @@ void pim_upstream_set_sptbit(struct pim_upstream *up, } // AND JoinDesired(S,G) == TRUE - // FIXME + if (!pim_upstream_evaluate_join_desired(up->channel_oil->pim, up)) { + if (PIM_DEBUG_TRACE) + zlog_debug("%s: %s Join is not Desired", + __PRETTY_FUNCTION__, up->sg_str); + return; + } // DirectlyConnected(S) == TRUE if (pim_if_connected_to_source(up->rpf.source_nexthop.interface, -- 2.39.5