proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 15:33:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: add 'detail' mpls debug setting

Browse Source 
Add setting and cli for 'debug zebra mpls detail'.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2021-04-05 13:48:21 -04:00
parent 283981e4a7
commit 04dda09218
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
zebra/debug.c
View File

@ -94,8 +94,11 @@ DEFUN_NOSH (show_debugging_zebra,
vty_out(vty, " Zebra detailed next-hop tracking debugging is on\n"); vty_out(vty, " Zebra detailed next-hop tracking debugging is on\n");
else if (IS_ZEBRA_DEBUG_NHT) else if (IS_ZEBRA_DEBUG_NHT)
vty_out(vty, " Zebra next-hop tracking debugging is on\n"); vty_out(vty, " Zebra next-hop tracking debugging is on\n");
if (IS_ZEBRA_DEBUG_MPLS) if (IS_ZEBRA_DEBUG_MPLS_DETAIL)
vty_out(vty, " Zebra detailed MPLS debugging is on\n");
else if (IS_ZEBRA_DEBUG_MPLS)
vty_out(vty, " Zebra MPLS debugging is on\n"); vty_out(vty, " Zebra MPLS debugging is on\n");
if (IS_ZEBRA_DEBUG_VXLAN) if (IS_ZEBRA_DEBUG_VXLAN)
vty_out(vty, " Zebra VXLAN debugging is on\n"); vty_out(vty, " Zebra VXLAN debugging is on\n");
if (IS_ZEBRA_DEBUG_PW) if (IS_ZEBRA_DEBUG_PW)
@ -159,14 +162,19 @@ DEFUN (debug_zebra_nht,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN (debug_zebra_mpls, DEFPY (debug_zebra_mpls,
debug_zebra_mpls_cmd, debug_zebra_mpls_cmd,
"debug zebra mpls", "debug zebra mpls [detailed$detail]",
DEBUG_STR DEBUG_STR
"Zebra configuration\n" "Zebra configuration\n"
"Debug option set for zebra MPLS LSPs\n") "Debug option set for zebra MPLS LSPs\n"
"Debug option for detailed info\n")
{ {
zebra_debug_mpls = ZEBRA_DEBUG_MPLS; zebra_debug_mpls = ZEBRA_DEBUG_MPLS;
if (detail)
zebra_debug_mpls |= ZEBRA_DEBUG_MPLS_DETAILED;
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -422,11 +430,12 @@ DEFUN (no_debug_zebra_nht,
DEFUN (no_debug_zebra_mpls, DEFUN (no_debug_zebra_mpls,
no_debug_zebra_mpls_cmd, no_debug_zebra_mpls_cmd,
"no debug zebra mpls", "no debug zebra mpls [detailed]",
NO_STR NO_STR
DEBUG_STR DEBUG_STR
"Zebra configuration\n" "Zebra configuration\n"
"Debug option set for zebra MPLS LSPs\n") "Debug option set for zebra MPLS LSPs\n"
"Debug option for zebra detailed info\n")
{ {
zebra_debug_mpls = 0; zebra_debug_mpls = 0;
return CMD_SUCCESS; return CMD_SUCCESS;
@ -628,10 +637,14 @@ static int config_write_debug(struct vty *vty)
write++; write++;
} }
if (IS_ZEBRA_DEBUG_MPLS) { if (IS_ZEBRA_DEBUG_MPLS_DETAIL) {
vty_out(vty, "debug zebra mpls detailed\n");
write++;
} else if (IS_ZEBRA_DEBUG_MPLS) {
vty_out(vty, "debug zebra mpls\n"); vty_out(vty, "debug zebra mpls\n");
write++; write++;
} }
if (IS_ZEBRA_DEBUG_VXLAN) { if (IS_ZEBRA_DEBUG_VXLAN) {
vty_out(vty, "debug zebra vxlan\n"); vty_out(vty, "debug zebra vxlan\n");
write++; write++;

5
zebra/debug.h
View File

@ -48,7 +48,8 @@ extern "C" {
#define ZEBRA_DEBUG_NHT 0x01 #define ZEBRA_DEBUG_NHT 0x01
#define ZEBRA_DEBUG_NHT_DETAILED 0x02 #define ZEBRA_DEBUG_NHT_DETAILED 0x02
#define ZEBRA_DEBUG_MPLS 0x01 #define ZEBRA_DEBUG_MPLS 0x01
#define ZEBRA_DEBUG_MPLS_DETAILED 0x02
#define ZEBRA_DEBUG_VXLAN 0x01 #define ZEBRA_DEBUG_VXLAN 0x01
@ -93,6 +94,8 @@ extern "C" {
#define IS_ZEBRA_DEBUG_NHT_DETAILED (zebra_debug_nht & ZEBRA_DEBUG_NHT_DETAILED) #define IS_ZEBRA_DEBUG_NHT_DETAILED (zebra_debug_nht & ZEBRA_DEBUG_NHT_DETAILED)
#define IS_ZEBRA_DEBUG_MPLS (zebra_debug_mpls & ZEBRA_DEBUG_MPLS) #define IS_ZEBRA_DEBUG_MPLS (zebra_debug_mpls & ZEBRA_DEBUG_MPLS)
#define IS_ZEBRA_DEBUG_MPLS_DETAIL \
(zebra_debug_mpls & ZEBRA_DEBUG_MPLS_DETAILED)
#define IS_ZEBRA_DEBUG_VXLAN (zebra_debug_vxlan & ZEBRA_DEBUG_VXLAN) #define IS_ZEBRA_DEBUG_VXLAN (zebra_debug_vxlan & ZEBRA_DEBUG_VXLAN)
#define IS_ZEBRA_DEBUG_PW (zebra_debug_pw & ZEBRA_DEBUG_PW) #define IS_ZEBRA_DEBUG_PW (zebra_debug_pw & ZEBRA_DEBUG_PW)