From: Donald Sharp <sharpd@cumulusnetwroks.com>
Date: Fri, 15 Jul 2016 13:42:57 +0000 (-0400)
Subject: pimd: Remove unneeded function.
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~375
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=64a70f46c331d05a0e99ffc7f250019f61d68082;p=matthieu%2Ffrr.git

pimd: Remove unneeded function.

Remove the prune_echo function as that it just took some
data and passed it into another function.

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

diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index a3d827f1e0..a95f48550b 100644
--- a/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@ -391,33 +391,6 @@ static int on_ifjoin_expiry_timer(struct thread *t)
   return 0;
 }
 
-static void prune_echo(struct interface *ifp,
-		       struct in_addr source_addr,
-		       struct in_addr group_addr)
-{
-  struct pim_interface *pim_ifp;
-  struct in_addr neigh_dst_addr;
-
-  pim_ifp = ifp->info;
-  zassert(pim_ifp);
-
-  neigh_dst_addr = pim_ifp->primary_address;
-
-  if (PIM_DEBUG_PIM_EVENTS) {
-    char source_str[100];
-    char group_str[100];
-    char neigh_dst_str[100];
-    pim_inet4_dump("<src?>", source_addr, source_str, sizeof(source_str));
-    pim_inet4_dump("<grp?>", group_addr, group_str, sizeof(group_str));
-    pim_inet4_dump("<neigh?>", neigh_dst_addr, neigh_dst_str, sizeof(neigh_dst_str));
-    zlog_debug("%s: sending PruneEcho(S,G)=(%s,%s) to upstream=%s on interface %s",
-	       __PRETTY_FUNCTION__, source_str, group_str, neigh_dst_str, ifp->name);
-  }
-
-  pim_joinprune_send(ifp, neigh_dst_addr, source_addr, group_addr,
-		     0 /* boolean: send_join=false (prune) */);
-}
-
 static int on_ifjoin_prune_pending_timer(struct thread *t)
 {
   struct pim_ifchannel *ch;
@@ -448,7 +421,8 @@ static int on_ifjoin_prune_pending_timer(struct thread *t)
   /* from here ch may have been deleted */
 
   if (send_prune_echo)
-    prune_echo(ifp, ch_source, ch_group);
+    pim_joinprune_send (ifp, pim_ifp->primary_address,
+			ch_source, ch_group, 0);
 
   return 0;
 }