From: Donald Sharp <sharpd@cumulusnetwroks.com>
Date: Thu, 28 Jul 2016 07:08:03 +0000 (-0400)
Subject: pimd: pim_str_sg_dump can't be called 2 times in the same debug
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~335
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6997705858f3bce0024d7cec56edc33040ace245;p=matthieu%2Ffrr.git

pimd: pim_str_sg_dump can't be called 2 times in the same debug

When we call pim_str_sg_dump we cannot call the variable twice
for the same debug.  This fixes this issue in the 2 places it
was borked.

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

diff --git a/pimd/pim_join.c b/pimd/pim_join.c
index 09af3f1ab3..265165d83b 100644
--- a/pimd/pim_join.c
+++ b/pimd/pim_join.c
@@ -107,9 +107,11 @@ static void recv_join(struct interface *ifp,
 
       if (up)
         {
+	  char buff[100];
+	  strcpy (buff, pim_str_sg_dump (&up->sg));
 	  zlog_debug("%s %s: Join(S,G)=%s from %s",
 		     __FILE__, __PRETTY_FUNCTION__,
-		     pim_str_sg_dump (&up->sg), pim_str_sg_dump (&sg));
+		     buff, pim_str_sg_dump (&sg));
 
 	  pim_rp_set_upstream_addr (&up->upstream_addr, up->sg.u.sg.src);
 	  pim_nexthop_lookup (&up->rpf.source_nexthop, up->upstream_addr, NULL);
@@ -168,9 +170,11 @@ static void recv_prune(struct interface *ifp,
 
       if (up)
         {
+	  char buff[100];
+	  strcpy (buff, pim_str_sg_dump (&up->sg));
 	  zlog_debug("%s %s: Prune(S,G)=%s from %s",
 		     __FILE__, __PRETTY_FUNCTION__,
-		     pim_str_sg_dump (&up->sg), pim_str_sg_dump (&sg));
+		     buff, pim_str_sg_dump (&sg));
 	  pim_ifchannel_prune (ifp, upstream, &up->sg, source_flags, holdtime);
         }
     }