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 3b8aed033c3e1f32ca6049c52ab44ad94a89583a..5fba681a7347dc6fd07238e7eee0740c33aab4e4 100644 (file)
--- 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 3058df1af4f61186bb22934b60bd9175a445d950..eb880bdffbccbfc80b5f35f8c36f5df0879301a0 100644 (file)
--- 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 4200c5e269f0f3d5a3a9ff30a67c22447cf9994f..695f0beb827e2b47f500bbd7a9907b2ff48a2d13 100644 (file)
--- 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 2abf0b296f0296945668b888618336f6a1d29727..a6d7f6e7492c3ffe0507661be6b14c54929f2d34 100644 (file)
--- 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;