ripngd: copy debug statements fix from ripd

Doesn't ripng needs same fix as ripd.

diff --git a/ripngd/ripng_debug.c b/ripngd/ripng_debug.c
index 78f13a71b4d1f203c933cc69567183b5f85ffe3a..33a7cf69fa136de8ebd2d2623c7497b30f47eb06 100644 (file)
--- a/ripngd/ripng_debug.c
+++ b/ripngd/ripng_debug.c
@@ -45,19 +45,16 @@ DEFUN (show_debugging_ripng,
     {
       if (IS_RIPNG_DEBUG_SEND && IS_RIPNG_DEBUG_RECV)
        {
-         vty_out (vty, "  RIPng packet%s debugging is on%s",
-                  IS_RIPNG_DEBUG_DETAIL ? " detail" : "",
+         vty_out (vty, "  RIPng packet debugging is on%s",
                   VTY_NEWLINE);
        }
       else
        {
          if (IS_RIPNG_DEBUG_SEND)
-           vty_out (vty, "  RIPng packet send%s debugging is on%s",
-                    IS_RIPNG_DEBUG_DETAIL ? " detail" : "",
+           vty_out (vty, "  RIPng packet send debugging is on%s",
                     VTY_NEWLINE);
          else
-           vty_out (vty, "  RIPng packet receive%s debugging is on%s",
-                    IS_RIPNG_DEBUG_DETAIL ? " detail" : "",
+           vty_out (vty, "  RIPng packet receive debugging is on%s",
                     VTY_NEWLINE);
        }
     }
@@ -106,11 +103,13 @@ DEFUN (debug_ripng_packet_direct,
     ripng_debug_packet |= RIPNG_DEBUG_SEND;
   if (strncmp ("recv", argv[0], strlen (argv[0])) == 0)
     ripng_debug_packet |= RIPNG_DEBUG_RECV;
-  ripng_debug_packet &= ~RIPNG_DEBUG_DETAIL;
+
   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 (recv|send) detail",
        DEBUG_STR
@@ -125,7 +124,7 @@ DEFUN (debug_ripng_packet_detail,
     ripng_debug_packet |= RIPNG_DEBUG_SEND;
   if (strncmp ("recv", argv[0], strlen (argv[0])) == 0)
     ripng_debug_packet |= RIPNG_DEBUG_RECV;
-  ripng_debug_packet |= RIPNG_DEBUG_DETAIL;
+
   return CMD_SUCCESS;
 }
 
@@ -225,20 +224,17 @@ config_write_debug (struct vty *vty)
     {
       if (IS_RIPNG_DEBUG_SEND && IS_RIPNG_DEBUG_RECV)
        {
-         vty_out (vty, "debug ripng packet%s%s",
-                  IS_RIPNG_DEBUG_DETAIL ? " detail" : "",
+         vty_out (vty, "debug ripng packet%s",
                   VTY_NEWLINE);
          write++;
        }
       else
        {
          if (IS_RIPNG_DEBUG_SEND)
-           vty_out (vty, "debug ripng packet send%s%s",
-                    IS_RIPNG_DEBUG_DETAIL ? " detail" : "",
+           vty_out (vty, "debug ripng packet send%s",
                     VTY_NEWLINE);
          else
-           vty_out (vty, "debug ripng packet recv%s%s",
-                    IS_RIPNG_DEBUG_DETAIL ? " detail" : "",
+           vty_out (vty, "debug ripng packet recv%s",
                     VTY_NEWLINE);
          write++;
        }

diff --git a/ripngd/ripng_debug.h b/ripngd/ripng_debug.h
index f5ed6eabc27619efe54b1244026de22d3954fd24..674345c0b95ba4710ceddd77d6cf4453a8888104 100644 (file)
--- a/ripngd/ripng_debug.h
+++ b/ripngd/ripng_debug.h
@@ -29,7 +29,6 @@
 #define RIPNG_DEBUG_PACKET  0x01
 #define RIPNG_DEBUG_SEND    0x20
 #define RIPNG_DEBUG_RECV    0x40
-#define RIPNG_DEBUG_DETAIL  0x80
 
 #define RIPNG_DEBUG_ZEBRA   0x01
 
@@ -39,7 +38,6 @@
 #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_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)