From: anuradhak <anuradhak@cumulusnetworks.com>
Date: Tue, 22 Nov 2016 19:26:45 +0000 (-0800)
Subject: pim-msdp: cleanup debug commands
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~67
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=886d1e80f68e85be02ce1cef12a061ab5adeca0a;p=mirror%2Ffrr.git

pim-msdp: cleanup debug commands

And fixup display spacing. No functional change.

Signed-off-by: Anuradha Karuppiah <anuradhak@cumulusnetworks.com>
---

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index ced7497e24..7ab2bb7b48 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -4837,6 +4837,8 @@ DEFUN (debug_pim,
   PIM_DO_DEBUG_PIM_EVENTS;
   PIM_DO_DEBUG_PIM_PACKETS;
   PIM_DO_DEBUG_PIM_TRACE;
+  PIM_DO_DEBUG_MSDP_EVENTS;
+  PIM_DO_DEBUG_MSDP_PACKETS;
   return CMD_SUCCESS;
 }
 
@@ -4850,6 +4852,8 @@ DEFUN (no_debug_pim,
   PIM_DONT_DEBUG_PIM_EVENTS;
   PIM_DONT_DEBUG_PIM_PACKETS;
   PIM_DONT_DEBUG_PIM_TRACE;
+  PIM_DONT_DEBUG_MSDP_EVENTS;
+  PIM_DONT_DEBUG_MSDP_PACKETS;
 
   PIM_DONT_DEBUG_PIM_PACKETDUMP_SEND;
   PIM_DONT_DEBUG_PIM_PACKETDUMP_RECV;
@@ -5632,7 +5636,7 @@ ip_msdp_show_peers(struct vty *vty, u_char uj)
   if (uj) {
     json = json_object_new_object();
   } else {
-    vty_out(vty, "Peer                       Local        State    Uptime  SaCnt%s", VTY_NEWLINE);
+    vty_out(vty, "Peer                       Local        State    Uptime   SaCnt%s", VTY_NEWLINE);
   }
 
   for (ALL_LIST_ELEMENTS_RO(msdp->peer_list, mpnode, mp)) {
@@ -5654,7 +5658,7 @@ ip_msdp_show_peers(struct vty *vty, u_char uj)
       json_object_int_add(json_row, "saCount", mp->sa_cnt);
       json_object_object_add(json, peer_str, json_row);
     } else {
-      vty_out(vty, "%-15s  %15s  %11s  %8s  %5d%s",
+      vty_out(vty, "%-15s  %15s  %11s  %8s  %6d%s",
           peer_str, local_str, state_str,
           timebuf, mp->sa_cnt, VTY_NEWLINE);
     }