bgpd: Reformat bpacket_reformat_for_peer

[mirror_frr.git] / ripngd / ripng_debug.c

diff --git a/ripngd/ripng_debug.c b/ripngd/ripng_debug.c
index 87759ed00e3b30d8752165a0133f3bd30a25ea2e..fe63d8fdead1f5cc0db9ccebea0f386cf67b8cb1 100644 (file)
--- a/ripngd/ripng_debug.c
+++ b/ripngd/ripng_debug.c
@@ -14,10 +14,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -29,36 +28,33 @@ unsigned long ripng_debug_event = 0;
 unsigned long ripng_debug_packet = 0;
 unsigned long ripng_debug_zebra = 0;
 
-DEFUN (show_debugging_ripng,
-       show_debugging_ripng_cmd,
-       "show debugging ripng",
-       SHOW_STR
-       DEBUG_STR
-       "RIPng configuration\n")
+DEFUN_NOSH (show_debugging_ripng,
+           show_debugging_ripng_cmd,
+           "show debugging [ripng]",
+           SHOW_STR
+           DEBUG_STR
+           "RIPng configuration\n")
 {
-       vty_out(vty, "RIPng debugging status:%s", VTY_NEWLINE);
+       vty_out(vty, "RIPng debugging status:\n");
 
        if (IS_RIPNG_DEBUG_EVENT)
-               vty_out(vty, "  RIPng event debugging is on%s", VTY_NEWLINE);
+               vty_out(vty, "  RIPng event debugging is on\n");
 
        if (IS_RIPNG_DEBUG_PACKET) {
                if (IS_RIPNG_DEBUG_SEND && IS_RIPNG_DEBUG_RECV) {
-                       vty_out(vty, "  RIPng packet debugging is on%s",
-                               VTY_NEWLINE);
+                       vty_out(vty, "  RIPng packet debugging is on\n");
                } else {
                        if (IS_RIPNG_DEBUG_SEND)
                                vty_out(vty,
-                                       "  RIPng packet send debugging is on%s",
-                                       VTY_NEWLINE);
+                                       "  RIPng packet send debugging is on\n");
                        else
                                vty_out(vty,
-                                       "  RIPng packet receive debugging is on%s",
-                                       VTY_NEWLINE);
+                                       "  RIPng packet receive debugging is on\n");
                }
        }
 
        if (IS_RIPNG_DEBUG_ZEBRA)
-               vty_out(vty, "  RIPng zebra debugging is on%s", VTY_NEWLINE);
+               vty_out(vty, "  RIPng zebra debugging is on\n");
 
        return CMD_SUCCESS;
 }
@@ -71,7 +67,7 @@ DEFUN (debug_ripng_events,
        "Debug option set for ripng events\n")
 {
        ripng_debug_event = RIPNG_DEBUG_EVENT;
-       return CMD_WARNING;
+       return CMD_SUCCESS;
 }
 
 DEFUN (debug_ripng_packet,
@@ -98,13 +94,9 @@ DEFUN (debug_ripng_packet_direct,
 {
        int idx_recv_send = 3;
        ripng_debug_packet |= RIPNG_DEBUG_PACKET;
-       if (strncmp("send", argv[idx_recv_send]->arg,
-                   strlen(argv[idx_recv_send]->arg))
-           == 0)
+       if (strcmp("send", argv[idx_recv_send]->text) == 0)
                ripng_debug_packet |= RIPNG_DEBUG_SEND;
-       if (strncmp("recv", argv[idx_recv_send]->arg,
-                   strlen(argv[idx_recv_send]->arg))
-           == 0)
+       if (strcmp("recv", argv[idx_recv_send]->text) == 0)
                ripng_debug_packet |= RIPNG_DEBUG_RECV;
 
        return CMD_SUCCESS;
@@ -118,7 +110,7 @@ DEFUN (debug_ripng_zebra,
        "Debug option set for ripng and zebra communication\n")
 {
        ripng_debug_zebra = RIPNG_DEBUG_ZEBRA;
-       return CMD_WARNING;
+       return CMD_SUCCESS;
 }
 
 DEFUN (no_debug_ripng_events,
@@ -156,16 +148,12 @@ DEFUN (no_debug_ripng_packet_direct,
        "Debug option set for send packet\n")
 {
        int idx_recv_send = 4;
-       if (strncmp("send", argv[idx_recv_send]->arg,
-                   strlen(argv[idx_recv_send]->arg))
-           == 0) {
+       if (strcmp("send", argv[idx_recv_send]->text) == 0) {
                if (IS_RIPNG_DEBUG_RECV)
                        ripng_debug_packet &= ~RIPNG_DEBUG_SEND;
                else
                        ripng_debug_packet = 0;
-       } else if (strncmp("recv", argv[idx_recv_send]->arg,
-                          strlen(argv[idx_recv_send]->arg))
-                  == 0) {
+       } else if (strcmp("recv", argv[idx_recv_send]->text) == 0) {
                if (IS_RIPNG_DEBUG_SEND)
                        ripng_debug_packet &= ~RIPNG_DEBUG_RECV;
                else
@@ -183,7 +171,7 @@ DEFUN (no_debug_ripng_zebra,
        "Debug option set for ripng and zebra communication\n")
 {
        ripng_debug_zebra = 0;
-       return CMD_WARNING;
+       return CMD_SUCCESS;
 }
 
 /* Debug node. */
@@ -197,38 +185,29 @@ static int config_write_debug(struct vty *vty)
        int write = 0;
 
        if (IS_RIPNG_DEBUG_EVENT) {
-               vty_out(vty, "debug ripng events%s", VTY_NEWLINE);
+               vty_out(vty, "debug ripng events\n");
                write++;
        }
        if (IS_RIPNG_DEBUG_PACKET) {
                if (IS_RIPNG_DEBUG_SEND && IS_RIPNG_DEBUG_RECV) {
-                       vty_out(vty, "debug ripng packet%s", VTY_NEWLINE);
+                       vty_out(vty, "debug ripng packet\n");
                        write++;
                } else {
                        if (IS_RIPNG_DEBUG_SEND)
-                               vty_out(vty, "debug ripng packet send%s",
-                                       VTY_NEWLINE);
+                               vty_out(vty, "debug ripng packet send\n");
                        else
-                               vty_out(vty, "debug ripng packet recv%s",
-                                       VTY_NEWLINE);
+                               vty_out(vty, "debug ripng packet recv\n");
                        write++;
                }
        }
        if (IS_RIPNG_DEBUG_ZEBRA) {
-               vty_out(vty, "debug ripng zebra%s", VTY_NEWLINE);
+               vty_out(vty, "debug ripng zebra\n");
                write++;
        }
        return write;
 }
 
-void ripng_debug_reset()
-{
-       ripng_debug_event = 0;
-       ripng_debug_packet = 0;
-       ripng_debug_zebra = 0;
-}
-
-void ripng_debug_init()
+void ripng_debug_init(void)
 {
        ripng_debug_event = 0;
        ripng_debug_packet = 0;