From 95744ad8644ccfa02ff41c394c0e0aea4b0964f3 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 26 Sep 2017 15:43:23 -0400 Subject: [PATCH 1/3] zebra: Display if we are debugging zebra vxlan or not Signed-off-by: Donald Sharp --- zebra/debug.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/zebra/debug.c b/zebra/debug.c index afeba1c6de..4ba8585f3e 100644 --- a/zebra/debug.c +++ b/zebra/debug.c @@ -83,6 +83,8 @@ DEFUN_NOSH (show_debugging_zebra, vty_out(vty, " Zebra next-hop tracking debugging is on\n"); if (IS_ZEBRA_DEBUG_MPLS) vty_out(vty, " Zebra MPLS debugging is on\n"); + if (IS_ZEBRA_DEBUG_VXLAN) + vty_out(vty, " Zebra VXLAN debugging is on\n"); if (IS_ZEBRA_DEBUG_PW) vty_out(vty, " Zebra pseudowire debugging is on\n"); From 07d3f521d2f6ee8ce3e7e8dbed255a0cc3ed18f4 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 26 Sep 2017 16:28:08 -0400 Subject: [PATCH 2/3] vtysh: Remove double display of daemon info for 'show debugging' When entering 'show debugging' we were outputting a line from vtysh and a line from an individual daemon to show the fact we were debugging. A bit overkill. Signed-off-by: Donald Sharp --- vtysh/vtysh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 78e64c1509..3f86f3c929 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -1896,7 +1896,7 @@ DEFUN (vtysh_show_debugging, DEBUG_STR) { return show_per_daemon("do show debugging\n", - "Debugging Information for %s:\n"); + ""); } DEFUN (vtysh_show_debugging_hashtable, From e1c3bf2477146386f71cb15503527d0fb7da7ce0 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 26 Sep 2017 16:29:31 -0400 Subject: [PATCH 3/3] watchfrr: Add a empty 'show debug..' command Allow watchfrr to silently ignore a 'show debug..' command for the moment. Signed-off-by: Donald Sharp --- watchfrr/watchfrr_vty.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/watchfrr/watchfrr_vty.c b/watchfrr/watchfrr_vty.c index 9cfdab44ab..fd9c017512 100644 --- a/watchfrr/watchfrr_vty.c +++ b/watchfrr/watchfrr_vty.c @@ -31,6 +31,16 @@ pid_t integrated_write_pid; static int integrated_result_fd; +DEFUN_NOSH(show_watchfrr_debugging, + show_watchfrr_debugging_cmd, + "show debugging [watchfrr]", + SHOW_STR + DEBUG_STR + "WatchFRR\n") +{ + return CMD_SUCCESS; +} + DEFUN(config_write_integrated, config_write_integrated_cmd, "write integrated", @@ -134,4 +144,5 @@ void watchfrr_vty_init(void) { integrated_write_pid = -1; install_element(ENABLE_NODE, &config_write_integrated_cmd); + install_element(ENABLE_NODE, &show_watchfrr_debugging_cmd); }