diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2022-08-08 09:11:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-08 09:11:38 +0200 |
| commit | 8e2eb5935aabb057c2bc22c71b3c2f846b3e3b36 (patch) | |
| tree | 2f09388beceaba306982e6f3a73b9bd37748671e /pimd | |
| parent | Merge pull request #11759 from donaldsharp/bfd_noarp (diff) | |
| parent | pim6d: Change the show running commands for pimv6 debugs (diff) | |
| download | frr-8e2eb5935aabb057c2bc22c71b3c2f846b3e3b36.tar.xz frr-8e2eb5935aabb057c2bc22c71b3c2f846b3e3b36.zip | |
Merge pull request #11720 from SaiGomathiN/pimv6debugfix
pim6d: Add 'show debugging [pimv6]' CLI and some fixes
Diffstat (limited to 'pimd')
| -rw-r--r-- | pimd/pim6_cmd.c | 16 | ||||
| -rw-r--r-- | pimd/pim6_main.c | 2 | ||||
| -rw-r--r-- | pimd/pim_cmd_common.c | 2 | ||||
| -rw-r--r-- | pimd/pim_vty.c | 4 |
4 files changed, 20 insertions, 4 deletions
diff --git a/pimd/pim6_cmd.c b/pimd/pim6_cmd.c index c209c5e13..01c574542 100644 --- a/pimd/pim6_cmd.c +++ b/pimd/pim6_cmd.c @@ -1516,6 +1516,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); @@ -1634,6 +1648,8 @@ void pim_cmd_init(void) install_element(ENABLE_NODE, &clear_ipv6_pim_interfaces_cmd); install_element(ENABLE_NODE, &clear_ipv6_pim_interface_traffic_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); diff --git a/pimd/pim6_main.c b/pimd/pim6_main.c index b3f4e4256..e0b5a87e0 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(); diff --git a/pimd/pim_cmd_common.c b/pimd/pim_cmd_common.c index bb03d61ad..45726b4e5 100644 --- a/pimd/pim_cmd_common.c +++ b/pimd/pim_cmd_common.c @@ -4114,6 +4114,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 43d9c2927..f9642b213 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; } |