From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 2 Aug 2016 15:39:16 +0000 (-0400)
Subject: pimd: Send join when a S,G is pruned
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~324
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=fa1a4e366ba4120d4009b5a7aedea10c062639e0;p=mirror%2Ffrr.git

pimd: Send join when a S,G is pruned

When a *,G is received, and we have S,G that is in a
non-joined state, Send the join to the S,G.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/pim_join.c b/pimd/pim_join.c
index 0a40ab6210..3d98f9f95f 100644
--- a/pimd/pim_join.c
+++ b/pimd/pim_join.c
@@ -116,7 +116,9 @@ static void recv_join(struct interface *ifp,
 		         __FILE__, __PRETTY_FUNCTION__,
 		         buff, pim_str_sg_dump (&sg));
 
-              pim_channel_add_oif (up->channel_oil, ifp, PIM_OIF_FLAG_PROTO_PIM);
+              pim_channel_add_oif (child->channel_oil, ifp, PIM_OIF_FLAG_PROTO_PIM);
+              if (child->join_state != PIM_UPSTREAM_JOINED)
+                pim_upstream_switch (child, PIM_UPSTREAM_JOINED);
             }
         }
     }