pim6d: Add debug mroute6 and detail commands

Adding below debug CLIs:
debug mroute6
debug mroute6 detail

Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>

diff --git a/pimd/pim6_cmd.c b/pimd/pim6_cmd.c
index 01c574542652173e975375c737edb4fd1c49b686..dc84de6bfd6377da01857d8b7dfa751fa83d5d33 100644 (file)
--- a/pimd/pim6_cmd.c
+++ b/pimd/pim6_cmd.c
@@ -1516,6 +1516,37 @@ DEFPY (debug_pimv6_zebra,
        return CMD_SUCCESS;
 }
 
+DEFPY (debug_mroute6,
+       debug_mroute6_cmd,
+       "[no] debug mroute6",
+       NO_STR
+       DEBUG_STR
+       DEBUG_MROUTE6_STR)
+{
+       if (!no)
+               PIM_DO_DEBUG_MROUTE;
+       else
+               PIM_DONT_DEBUG_MROUTE;
+
+       return CMD_SUCCESS;
+}
+
+DEFPY (debug_mroute6_detail,
+       debug_mroute6_detail_cmd,
+       "[no] debug mroute6 detail",
+       NO_STR
+       DEBUG_STR
+       DEBUG_MROUTE6_STR
+       "detailed\n")
+{
+       if (!no)
+               PIM_DO_DEBUG_MROUTE_DETAIL;
+       else
+               PIM_DONT_DEBUG_MROUTE_DETAIL;
+
+       return CMD_SUCCESS;
+}
+
 DEFUN_NOSH (show_debugging_pimv6,
            show_debugging_pimv6_cmd,
            "show debugging [pimv6]",
@@ -1660,6 +1691,8 @@ void pim_cmd_init(void)
        install_element(ENABLE_NODE, &debug_pimv6_trace_cmd);
        install_element(ENABLE_NODE, &debug_pimv6_trace_detail_cmd);
        install_element(ENABLE_NODE, &debug_pimv6_zebra_cmd);
+       install_element(ENABLE_NODE, &debug_mroute6_cmd);
+       install_element(ENABLE_NODE, &debug_mroute6_detail_cmd);
 
        install_element(CONFIG_NODE, &debug_pimv6_cmd);
        install_element(CONFIG_NODE, &debug_pimv6_nht_cmd);
@@ -1671,4 +1704,6 @@ void pim_cmd_init(void)
        install_element(CONFIG_NODE, &debug_pimv6_trace_cmd);
        install_element(CONFIG_NODE, &debug_pimv6_trace_detail_cmd);
        install_element(CONFIG_NODE, &debug_pimv6_zebra_cmd);
+       install_element(CONFIG_NODE, &debug_mroute6_cmd);
+       install_element(CONFIG_NODE, &debug_mroute6_detail_cmd);
 }

diff --git a/pimd/pim6_cmd.h b/pimd/pim6_cmd.h
index 8fb82d9f2677d3493004728c368e3f189ac3d700..c45c998453511bf8e6ac74b20d115f91bc877e4e 100644 (file)
--- a/pimd/pim6_cmd.h
+++ b/pimd/pim6_cmd.h
@@ -57,6 +57,7 @@
 #define DEBUG_PIMV6_PACKETDUMP_RECV_STR "Dump received packets\n"
 #define DEBUG_PIMV6_TRACE_STR "PIMv6 internal daemon activity\n"
 #define DEBUG_PIMV6_ZEBRA_STR "ZEBRA protocol activity\n"
+#define DEBUG_MROUTE6_STR "PIMv6 interaction with kernel MFC cache\n"
 
 void pim_cmd_init(void);
 

diff --git a/pimd/pim_addr.h b/pimd/pim_addr.h
index 2f0743b570d63d1e536bced900ec3df324036a99..2f2ff246754986391f0b08198cf8c61b717f3cee 100644 (file)
--- a/pimd/pim_addr.h
+++ b/pimd/pim_addr.h
@@ -36,6 +36,7 @@ typedef struct in_addr pim_addr;
 #define PIM_MAX_BITLEN IPV4_MAX_BITLEN
 #define PIM_AF_NAME     "ip"
 #define PIM_AF_DBG     "pim"
+#define PIM_MROUTE_DBG  "mroute"
 #define PIMREG          "pimreg"
 
 #define PIM_ADDR_FUNCNAME(name) ipv4_##name
@@ -61,6 +62,7 @@ typedef struct in6_addr pim_addr;
 #define PIM_MAX_BITLEN IPV6_MAX_BITLEN
 #define PIM_AF_NAME     "ipv6"
 #define PIM_AF_DBG     "pimv6"
+#define PIM_MROUTE_DBG  "mroute6"
 #define PIMREG          "pim6reg"
 
 #define PIM_ADDR_FUNCNAME(name) ipv6_##name

diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index f9642b21331e09aceb3287db566606ea0b43c393..3d5d68b1f4b617739df86ca7059b3ff013923f00 100644 (file)
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -78,11 +78,11 @@ int pim_debug_config_write(struct vty *vty)
 
        /* PIM_DEBUG_MROUTE catches _DETAIL too */
        if (router->debugs & PIM_MASK_MROUTE) {
-               vty_out(vty, "debug mroute\n");
+               vty_out(vty, "debug " PIM_MROUTE_DBG "\n");
                ++writes;
        }
        if (PIM_DEBUG_MROUTE_DETAIL) {
-               vty_out(vty, "debug mroute detail\n");
+               vty_out(vty, "debug " PIM_MROUTE_DBG " detail\n");
                ++writes;
        }