From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 1 Nov 2016 00:01:16 +0000 (-0400)
Subject: pimd: Modify Debug to be better
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~146
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=5d84a3bc9a332d36e9ac0809170601abaf244bdf;p=mirror%2Ffrr.git

pimd: Modify Debug to be better

Make debugs of some pim processes easier
to interpret and understand.

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

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index d0c05563c0..6eb14a140d 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -1672,6 +1672,7 @@ static void pim_show_upstream(struct vty *vty, u_char uj)
       json_object_string_add(json_row, "resetTimer", rs_timer);
       json_object_string_add(json_row, "keepaliveTimer", ka_timer);
       json_object_int_add(json_row, "refCount", up->ref_count);
+      json_object_int_add(json_row, "sptBit", up->sptbit);
       json_object_object_add(json_group, src_str, json_row);
     } else {
       vty_out(vty, "%-10s%-15s %-15s %-11s %-8s %-9s %-9s %-9s %6d%s",
diff --git a/pimd/pim_register.c b/pimd/pim_register.c
index c941388dc4..eab87fefb0 100644
--- a/pimd/pim_register.c
+++ b/pimd/pim_register.c
@@ -268,14 +268,6 @@ pim_register_recv (struct interface *ifp,
     return 0;
   }
 
-  if (PIM_DEBUG_PIM_REG)
-    {
-      char src_str[INET_ADDRSTRLEN];
-
-      pim_inet4_dump ("<src?>", src_addr, src_str, sizeof (src_str));
-      zlog_debug ("Received Register message from %s on %s", src_str, ifp->name);
-    }
-
   /*
    * Please note this is not drawn to get the correct bit/data size
    *
@@ -307,6 +299,16 @@ pim_register_recv (struct interface *ifp,
   sg.grp = ip_hdr->ip_dst;
 
   i_am_rp = I_am_RP (sg.grp);
+
+  if (PIM_DEBUG_PIM_REG)
+    {
+      char src_str[INET_ADDRSTRLEN];
+
+      pim_inet4_dump ("<src?>", src_addr, src_str, sizeof (src_str));
+      zlog_debug ("Received Register message(%s) from %s on %s, rp: %d",
+                  pim_str_sg_dump (&sg), src_str, ifp->name, i_am_rp);
+    }
+
   if (i_am_rp && (dest_addr.s_addr == ((RP (sg.grp))->rpf_addr.u.prefix4.s_addr))) {
     sentRegisterStop = 0;
 
@@ -360,8 +362,10 @@ pim_register_recv (struct interface *ifp,
       //pim_scan_individual_oil (upstream->channel_oil);
       pim_register_stop_send (ifp, &sg, dest_addr, src_addr);
       sentRegisterStop = 1;
+    } else {
+      if (PIM_DEBUG_PIM_REG)
+         zlog_debug ("(%s) sptbit: %d", pim_str_sg_dump (&upstream->sg), upstream->sptbit);
     }
-
     if ((upstream->sptbit == PIM_UPSTREAM_SPTBIT_TRUE) ||
 	(SwitchToSptDesired(&sg))) {
       if (sentRegisterStop) {