From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 24 Aug 2016 13:26:54 +0000 (-0400)
Subject: pimd: Do not send join out loopback interfaces
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~266
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=eb345962ceeb4c7eb30e7a54faf3d1c1449dd69f;p=mirror%2Ffrr.git

pimd: Do not send join out loopback interfaces

When we the join timer pops for a interface
don't send the join out a loopback interface.

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

diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index ffb026603e..5c142a1674 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -209,7 +209,12 @@ static int on_join_timer(struct thread *t)
   if (up->fhr)
     return 0;
 
-  pim_upstream_send_join (up);
+  /*
+   * Don't send the join if the outgoing interface is a loopback
+   * But since this might change leave the join timer running
+   */
+  if (!if_is_loopback (up->rpf.source_nexthop.interface))
+    pim_upstream_send_join (up);
 
   join_timer_start(up);