From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 17 Nov 2016 00:20:33 +0000 (-0500)
Subject: pimd: Add appropriate (S,G) debugs for register
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~84
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=0e3b3d5d1023543618d7c792f32b93e171bd250b;p=mirror%2Ffrr.git

pimd: Add appropriate (S,G) debugs for register

When we send a register record the S,G if debugs are turned on.

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

diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index 3b8aed033c..5fba681a73 100644
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -216,8 +216,7 @@ pim_mroute_msg_wholepkt (int fd, struct interface *ifp, const char *buf)
    */
   if (!up->t_rs_timer)
     pim_register_send((uint8_t *)buf + sizeof(struct ip), ntohs (ip_hdr->ip_len),
-		      pim_ifp->primary_address, rpg, 0);
-
+		      pim_ifp->primary_address, rpg, 0, up);
   return 0;
 }
 
diff --git a/pimd/pim_register.c b/pimd/pim_register.c
index 3058df1af4..eb880bdffb 100644
--- a/pimd/pim_register.c
+++ b/pimd/pim_register.c
@@ -145,7 +145,7 @@ pim_register_stop_recv (uint8_t *buf, int buf_size)
 }
 
 void
-pim_register_send (const uint8_t *buf, int buf_size, struct in_addr src, struct pim_rpf *rpg, int null_register)
+pim_register_send (const uint8_t *buf, int buf_size, struct in_addr src, struct pim_rpf *rpg, int null_register, struct pim_upstream *up)
 {
   unsigned char buffer[10000];
   unsigned char *b1;
@@ -156,7 +156,8 @@ pim_register_send (const uint8_t *buf, int buf_size, struct in_addr src, struct
     {
        char rp_str[INET_ADDRSTRLEN];
        strcpy (rp_str, inet_ntoa (rpg->rpf_addr.u.prefix4));
-       zlog_debug ("Sending %sRegister Packet to %s", null_register ? "NULL " : "", rp_str);
+       zlog_debug ("Sending %s %sRegister Packet to %s",
+		   pim_str_sg_dump (&up->sg), null_register ? "NULL " : "", rp_str);
     }
 
   ifp = rpg->source_nexthop.interface;
diff --git a/pimd/pim_register.h b/pimd/pim_register.h
index 4200c5e269..695f0beb82 100644
--- a/pimd/pim_register.h
+++ b/pimd/pim_register.h
@@ -42,7 +42,7 @@ int pim_register_recv (struct interface *ifp,
 		       struct in_addr src_addr,
 		       uint8_t *tlv_buf, int tlv_buf_size);
 
-void pim_register_send (const uint8_t *buf, int buf_size, struct in_addr src, struct pim_rpf *rpg, int null_register);
+void pim_register_send (const uint8_t *buf, int buf_size, struct in_addr src, struct pim_rpf *rpg, int null_register, struct pim_upstream *up);
 void pim_register_stop_send (struct interface *ifp, struct prefix_sg *sg, struct in_addr src, struct in_addr originator);
 
 #endif
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 2abf0b296f..a6d7f6e749 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -1170,7 +1170,7 @@ pim_upstream_register_stop_timer (struct thread *t)
       ip_hdr.ip_len = htons (20);
       // checksum is broken
       pim_register_send ((uint8_t *)&ip_hdr, sizeof (struct ip),
-			 pim_ifp->primary_address, rpg, 1);
+			 pim_ifp->primary_address, rpg, 1, up);
       break;
     default:
       break;