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 <sharpd@cumulusnetworks.com>

diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 2a0804e10bc5707d85c1e86f33f17f22c9306352..f1347b7eafeaf5a344502efa00ab079635b35216 100644 (file)
--- 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,