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

ripngd: copy debug statements fix from ripd

Browse Source 
Doesn't ripng needs same fix as ripd.
This commit is contained in:
Stephen Hemminger 2011-03-13 01:14:08 +03:00 committed by Denis Ovsienko
parent 8422e8b91b
commit 1809ec13de
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ripngd/ripng_debug.c
View File

@ -45,19 +45,16 @@ DEFUN (show_debugging_ripng,
{ {
if (IS_RIPNG_DEBUG_SEND && IS_RIPNG_DEBUG_RECV) if (IS_RIPNG_DEBUG_SEND && IS_RIPNG_DEBUG_RECV)
{ {
vty_out (vty, " RIPng packet%s debugging is on%s", vty_out (vty, " RIPng packet debugging is on%s",
IS_RIPNG_DEBUG_DETAIL ? " detail" : "",
VTY_NEWLINE); VTY_NEWLINE);
} }
else else
{ {
if (IS_RIPNG_DEBUG_SEND) if (IS_RIPNG_DEBUG_SEND)
vty_out (vty, " RIPng packet send%s debugging is on%s", vty_out (vty, " RIPng packet send debugging is on%s",
IS_RIPNG_DEBUG_DETAIL ? " detail" : "",
VTY_NEWLINE); VTY_NEWLINE);
else else
vty_out (vty, " RIPng packet receive%s debugging is on%s", vty_out (vty, " RIPng packet receive debugging is on%s",
IS_RIPNG_DEBUG_DETAIL ? " detail" : "",
VTY_NEWLINE); VTY_NEWLINE);
} }
} }
@ -106,11 +103,13 @@ DEFUN (debug_ripng_packet_direct,
ripng_debug_packet |= RIPNG_DEBUG_SEND; ripng_debug_packet |= RIPNG_DEBUG_SEND;
if (strncmp ("recv", argv[0], strlen (argv[0])) == 0) if (strncmp ("recv", argv[0], strlen (argv[0])) == 0)
ripng_debug_packet |= RIPNG_DEBUG_RECV; ripng_debug_packet |= RIPNG_DEBUG_RECV;
ripng_debug_packet &= ~RIPNG_DEBUG_DETAIL;
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN (debug_ripng_packet_detail, /* N.B. the "detail" modifier is a no-op. we leave this command
for legacy compatibility. */
DEFUN_DEPRECATED (debug_ripng_packet_detail,
debug_ripng_packet_detail_cmd, debug_ripng_packet_detail_cmd,
"debug ripng packet (recv|send) detail", "debug ripng packet (recv|send) detail",
DEBUG_STR DEBUG_STR
@ -125,7 +124,7 @@ DEFUN (debug_ripng_packet_detail,
ripng_debug_packet |= RIPNG_DEBUG_SEND; ripng_debug_packet |= RIPNG_DEBUG_SEND;
if (strncmp ("recv", argv[0], strlen (argv[0])) == 0) if (strncmp ("recv", argv[0], strlen (argv[0])) == 0)
ripng_debug_packet |= RIPNG_DEBUG_RECV; ripng_debug_packet |= RIPNG_DEBUG_RECV;
ripng_debug_packet |= RIPNG_DEBUG_DETAIL;
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -225,20 +224,17 @@ config_write_debug (struct vty *vty)
{ {
if (IS_RIPNG_DEBUG_SEND && IS_RIPNG_DEBUG_RECV) if (IS_RIPNG_DEBUG_SEND && IS_RIPNG_DEBUG_RECV)
{ {
vty_out (vty, "debug ripng packet%s%s", vty_out (vty, "debug ripng packet%s",
IS_RIPNG_DEBUG_DETAIL ? " detail" : "",
VTY_NEWLINE); VTY_NEWLINE);
write++; write++;
} }
else else
{ {
if (IS_RIPNG_DEBUG_SEND) if (IS_RIPNG_DEBUG_SEND)
vty_out (vty, "debug ripng packet send%s%s", vty_out (vty, "debug ripng packet send%s",
IS_RIPNG_DEBUG_DETAIL ? " detail" : "",
VTY_NEWLINE); VTY_NEWLINE);
else else
vty_out (vty, "debug ripng packet recv%s%s", vty_out (vty, "debug ripng packet recv%s",
IS_RIPNG_DEBUG_DETAIL ? " detail" : "",
VTY_NEWLINE); VTY_NEWLINE);
write++; write++;
} }

2
ripngd/ripng_debug.h
View File

@ -29,7 +29,6 @@
#define RIPNG_DEBUG_PACKET 0x01 #define RIPNG_DEBUG_PACKET 0x01
#define RIPNG_DEBUG_SEND 0x20 #define RIPNG_DEBUG_SEND 0x20
#define RIPNG_DEBUG_RECV 0x40 #define RIPNG_DEBUG_RECV 0x40
#define RIPNG_DEBUG_DETAIL 0x80
#define RIPNG_DEBUG_ZEBRA 0x01 #define RIPNG_DEBUG_ZEBRA 0x01
@ -39,7 +38,6 @@
#define IS_RIPNG_DEBUG_PACKET (ripng_debug_packet & RIPNG_DEBUG_PACKET) #define IS_RIPNG_DEBUG_PACKET (ripng_debug_packet & RIPNG_DEBUG_PACKET)
#define IS_RIPNG_DEBUG_SEND (ripng_debug_packet & RIPNG_DEBUG_SEND) #define IS_RIPNG_DEBUG_SEND (ripng_debug_packet & RIPNG_DEBUG_SEND)
#define IS_RIPNG_DEBUG_RECV (ripng_debug_packet & RIPNG_DEBUG_RECV) #define IS_RIPNG_DEBUG_RECV (ripng_debug_packet & RIPNG_DEBUG_RECV)
#define IS_RIPNG_DEBUG_DETAIL (ripng_debug_packet & RIPNG_DEBUG_DETAIL)
#define IS_RIPNG_DEBUG_ZEBRA (ripng_debug_zebra & RIPNG_DEBUG_ZEBRA) #define IS_RIPNG_DEBUG_ZEBRA (ripng_debug_zebra & RIPNG_DEBUG_ZEBRA)