From 1f2ecfe5abc8dbf0dd9fa774a11d3d2660a94bcc Mon Sep 17 00:00:00 2001 From: Sai Gomathi N Date: Tue, 2 Aug 2022 05:36:02 -0700 Subject: [PATCH 1/3] pim6d: Add 'show debugging [pimv6]' CLI Adding show debugging CLI for pimv6 debugs. Signed-off-by: Sai Gomathi N --- pimd/pim6_cmd.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pimd/pim6_cmd.c b/pimd/pim6_cmd.c index d72a67243b..1378c5296c 100644 --- a/pimd/pim6_cmd.c +++ b/pimd/pim6_cmd.c @@ -1503,6 +1503,20 @@ DEFPY (debug_pimv6_zebra, return CMD_SUCCESS; } +DEFUN_NOSH (show_debugging_pimv6, + show_debugging_pimv6_cmd, + "show debugging [pimv6]", + SHOW_STR + DEBUG_STR + "PIMv6 Information\n") +{ + vty_out(vty, "PIMv6 debugging status\n"); + + pim_debug_config_write(vty); + + return CMD_SUCCESS; +} + void pim_cmd_init(void) { if_cmd_init(pim_interface_config_write); @@ -1620,6 +1634,8 @@ void pim_cmd_init(void) install_element(ENABLE_NODE, &clear_ipv6_pim_bsr_db_cmd); install_element(ENABLE_NODE, &clear_ipv6_pim_interfaces_cmd); + install_element(ENABLE_NODE, &show_debugging_pimv6_cmd); + install_element(ENABLE_NODE, &debug_pimv6_cmd); install_element(ENABLE_NODE, &debug_pimv6_nht_cmd); install_element(ENABLE_NODE, &debug_pimv6_nht_det_cmd); From 2af7b0450bead3776659ef54aec706f0dfdc4594 Mon Sep 17 00:00:00 2001 From: Sai Gomathi N Date: Tue, 2 Aug 2022 05:50:02 -0700 Subject: [PATCH 2/3] pim6d: Removing the to-do item in pimv6 debug Removing the temporary enabling of all debugs for pimv6 Signed-off-by: Sai Gomathi N --- pimd/pim6_main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/pimd/pim6_main.c b/pimd/pim6_main.c index b3f4e4256c..e0b5a87e05 100644 --- a/pimd/pim6_main.c +++ b/pimd/pim6_main.c @@ -161,8 +161,6 @@ int main(int argc, char **argv, char **envp) } pim_router_init(); - /* TODO PIM6: temporary enable all debugs, remove later in PIMv6 work */ - router->debugs = ~0U; access_list_init(); prefix_list_init(); From 614b77fef5712ec10546764b2ca49c50792f95a2 Mon Sep 17 00:00:00 2001 From: Sai Gomathi N Date: Tue, 2 Aug 2022 06:34:30 -0700 Subject: [PATCH 3/3] pim6d: Change the show running commands for pimv6 debugs Change the show running commands for bsm and vxlan pimv4 and pimv6 debug commands based on the address family. Including bsm and vxlan in no debug pimv6 debug. Signed-off-by: Sai Gomathi N --- pimd/pim_cmd_common.c | 2 ++ pimd/pim_vty.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pimd/pim_cmd_common.c b/pimd/pim_cmd_common.c index b7bd7375c5..7c41026430 100644 --- a/pimd/pim_cmd_common.c +++ b/pimd/pim_cmd_common.c @@ -4045,6 +4045,8 @@ int pim_no_debug_pim_cmd(void) PIM_DONT_DEBUG_PIM_PACKETDUMP_SEND; PIM_DONT_DEBUG_PIM_PACKETDUMP_RECV; + PIM_DONT_DEBUG_BSM; + PIM_DONT_DEBUG_VXLAN; return CMD_SUCCESS; } diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c index 43d9c29278..f9642b2133 100644 --- a/pimd/pim_vty.c +++ b/pimd/pim_vty.c @@ -129,12 +129,12 @@ int pim_debug_config_write(struct vty *vty) } if (PIM_DEBUG_BSM) { - vty_out(vty, "debug pim bsm\n"); + vty_out(vty, "debug " PIM_AF_DBG " bsm\n"); ++writes; } if (PIM_DEBUG_VXLAN) { - vty_out(vty, "debug pim vxlan\n"); + vty_out(vty, "debug " PIM_AF_DBG " vxlan\n"); ++writes; }