Merge pull request #5259 from mjstapp/dplane_sample_plugin

[mirror_frr.git] / ldpd / ldp_debug.c

diff --git a/ldpd/ldp_debug.c b/ldpd/ldp_debug.c
index ee4f0843b7d7079095720e4b8f870c3d08dc70ca..ec70ef510adecd14d82c2cc76ed3f3f462aefe1e 100644 (file)
--- a/ldpd/ldp_debug.c
+++ b/ldpd/ldp_debug.c
@@ -41,64 +41,67 @@ int
 ldp_vty_debug(struct vty *vty, const char *negate, const char *type_str,
     const char *dir_str, const char *all)
 {
+       if (type_str == NULL)
+               return (CMD_WARNING_CONFIG_FAILED);
+
        if (strcmp(type_str, "discovery") == 0) {
                if (dir_str == NULL)
                        return (CMD_WARNING_CONFIG_FAILED);
 
                if (dir_str[0] == 'r') {
                        if (negate)
-                               DEBUG_OFF(hello, HELLO_RECV);
+                               DEBUG_OFF(hello, LDP_DEBUG_HELLO_RECV);
                        else
-                               DEBUG_ON(hello, HELLO_RECV);
+                               DEBUG_ON(hello, LDP_DEBUG_HELLO_RECV);
                } else {
                        if (negate)
-                               DEBUG_OFF(hello, HELLO_SEND);
+                               DEBUG_OFF(hello, LDP_DEBUG_HELLO_SEND);
                        else
-                               DEBUG_ON(hello, HELLO_SEND);
+                               DEBUG_ON(hello, LDP_DEBUG_HELLO_SEND);
                }
        } else if (strcmp(type_str, "errors") == 0) {
                if (negate)
-                       DEBUG_OFF(errors, ERRORS);
+                       DEBUG_OFF(errors, LDP_DEBUG_ERRORS);
                else
-                       DEBUG_ON(errors, ERRORS);
+                       DEBUG_ON(errors, LDP_DEBUG_ERRORS);
        } else if (strcmp(type_str, "event") == 0) {
                if (negate)
-                       DEBUG_OFF(event, EVENT);
+                       DEBUG_OFF(event, LDP_DEBUG_EVENT);
                else
-                       DEBUG_ON(event, EVENT);
+                       DEBUG_ON(event, LDP_DEBUG_EVENT);
        } else if (strcmp(type_str, "labels") == 0) {
                if (negate)
-                       DEBUG_OFF(labels, LABELS);
+                       DEBUG_OFF(labels, LDP_DEBUG_LABELS);
                else
-                       DEBUG_ON(labels, LABELS);
+                       DEBUG_ON(labels, LDP_DEBUG_LABELS);
        } else if (strcmp(type_str, "messages") == 0) {
                if (dir_str == NULL)
                        return (CMD_WARNING_CONFIG_FAILED);
 
                if (dir_str[0] == 'r') {
                        if (negate) {
-                               DEBUG_OFF(msg, MSG_RECV);
-                               DEBUG_OFF(msg, MSG_RECV_ALL);
+                               DEBUG_OFF(msg, LDP_DEBUG_MSG_RECV);
+                               DEBUG_OFF(msg, LDP_DEBUG_MSG_RECV_ALL);
                        } else {
-                               DEBUG_ON(msg, MSG_RECV);
+                               DEBUG_ON(msg, LDP_DEBUG_MSG_RECV);
                                if (all)
-                                       DEBUG_ON(msg, MSG_RECV_ALL);
+                                       DEBUG_ON(msg, LDP_DEBUG_MSG_RECV_ALL);
                        }
                } else {
                        if (negate) {
-                               DEBUG_OFF(msg, MSG_SEND);
-                               DEBUG_OFF(msg, MSG_SEND_ALL);
+                               DEBUG_OFF(msg, LDP_DEBUG_MSG_SEND);
+                               DEBUG_OFF(msg, LDP_DEBUG_MSG_SEND_ALL);
                        } else {
-                               DEBUG_ON(msg, MSG_SEND);
+                               DEBUG_ON(msg, LDP_DEBUG_MSG_SEND);
                                if (all)
-                                       DEBUG_ON(msg, MSG_SEND_ALL);
+                                       DEBUG_ON(msg, LDP_DEBUG_MSG_SEND_ALL);
                        }
                }
        } else if (strcmp(type_str, "zebra") == 0) {
                if (negate)
-                       DEBUG_OFF(zebra, ZEBRA);
+                       DEBUG_OFF(zebra, LDP_DEBUG_ZEBRA);
                else
-                       DEBUG_ON(zebra, ZEBRA);
+                       DEBUG_ON(zebra, LDP_DEBUG_ZEBRA);
        }
 
        main_imsg_compose_both(IMSG_DEBUG_UPDATE, &ldp_debug,
@@ -112,27 +115,27 @@ ldp_vty_show_debugging(struct vty *vty)
 {
        vty_out (vty, "LDP debugging status:\n");
 
-       if (LDP_DEBUG(hello, HELLO_RECV))
+       if (LDP_DEBUG(hello, LDP_DEBUG_HELLO_RECV))
                vty_out (vty,"  LDP discovery debugging is on (inbound)\n");
-       if (LDP_DEBUG(hello, HELLO_SEND))
+       if (LDP_DEBUG(hello, LDP_DEBUG_HELLO_SEND))
                vty_out (vty,"  LDP discovery debugging is on (outbound)\n");
-       if (LDP_DEBUG(errors, ERRORS))
+       if (LDP_DEBUG(errors, LDP_DEBUG_ERRORS))
                vty_out (vty, "  LDP errors debugging is on\n");
-       if (LDP_DEBUG(event, EVENT))
+       if (LDP_DEBUG(event, LDP_DEBUG_EVENT))
                vty_out (vty, "  LDP events debugging is on\n");
-       if (LDP_DEBUG(labels, LABELS))
+       if (LDP_DEBUG(labels, LDP_DEBUG_LABELS))
                vty_out (vty, "  LDP labels debugging is on\n");
-       if (LDP_DEBUG(msg, MSG_RECV_ALL))
+       if (LDP_DEBUG(msg, LDP_DEBUG_MSG_RECV_ALL))
                vty_out (vty,
                          "  LDP detailed messages debugging is on (inbound)\n");
-       else if (LDP_DEBUG(msg, MSG_RECV))
+       else if (LDP_DEBUG(msg, LDP_DEBUG_MSG_RECV))
                vty_out (vty,"  LDP messages debugging is on (inbound)\n");
-       if (LDP_DEBUG(msg, MSG_SEND_ALL))
+       if (LDP_DEBUG(msg, LDP_DEBUG_MSG_SEND_ALL))
                vty_out (vty,
                          "  LDP detailed messages debugging is on (outbound)\n");
-       else if (LDP_DEBUG(msg, MSG_SEND))
+       else if (LDP_DEBUG(msg, LDP_DEBUG_MSG_SEND))
                vty_out (vty,"  LDP messages debugging is on (outbound)\n");
-       if (LDP_DEBUG(zebra, ZEBRA))
+       if (LDP_DEBUG(zebra, LDP_DEBUG_ZEBRA))
                vty_out (vty, "  LDP zebra debugging is on\n");
        vty_out (vty, "\n");
 
@@ -144,48 +147,48 @@ ldp_debug_config_write(struct vty *vty)
 {
        int write = 0;
 
-       if (CONF_LDP_DEBUG(hello, HELLO_RECV)) {
+       if (CONF_LDP_DEBUG(hello, LDP_DEBUG_HELLO_RECV)) {
                vty_out (vty,"debug mpls ldp discovery hello recv\n");
                write = 1;
        }
 
-       if (CONF_LDP_DEBUG(hello, HELLO_SEND)) {
+       if (CONF_LDP_DEBUG(hello, LDP_DEBUG_HELLO_SEND)) {
                vty_out (vty,"debug mpls ldp discovery hello sent\n");
                write = 1;
        }
 
-       if (CONF_LDP_DEBUG(errors, ERRORS)) {
+       if (CONF_LDP_DEBUG(errors, LDP_DEBUG_ERRORS)) {
                vty_out (vty, "debug mpls ldp errors\n");
                write = 1;
        }
 
-       if (CONF_LDP_DEBUG(event, EVENT)) {
+       if (CONF_LDP_DEBUG(event, LDP_DEBUG_EVENT)) {
                vty_out (vty, "debug mpls ldp event\n");
                write = 1;
        }
 
-       if (CONF_LDP_DEBUG(labels, LABELS)) {
+       if (CONF_LDP_DEBUG(labels, LDP_DEBUG_LABELS)) {
                vty_out (vty, "debug mpls ldp labels\n");
                write = 1;
        }
 
-       if (CONF_LDP_DEBUG(msg, MSG_RECV_ALL)) {
+       if (CONF_LDP_DEBUG(msg, LDP_DEBUG_MSG_RECV_ALL)) {
                vty_out (vty, "debug mpls ldp messages recv all\n");
                write = 1;
-       } else if (CONF_LDP_DEBUG(msg, MSG_RECV)) {
+       } else if (CONF_LDP_DEBUG(msg, LDP_DEBUG_MSG_RECV)) {
                vty_out (vty, "debug mpls ldp messages recv\n");
                write = 1;
        }
 
-       if (CONF_LDP_DEBUG(msg, MSG_SEND_ALL)) {
+       if (CONF_LDP_DEBUG(msg, LDP_DEBUG_MSG_SEND_ALL)) {
                vty_out (vty, "debug mpls ldp messages sent all\n");
                write = 1;
-       } else if (CONF_LDP_DEBUG(msg, MSG_SEND)) {
+       } else if (CONF_LDP_DEBUG(msg, LDP_DEBUG_MSG_SEND)) {
                vty_out (vty, "debug mpls ldp messages sent\n");
                write = 1;
        }
 
-       if (CONF_LDP_DEBUG(zebra, ZEBRA)) {
+       if (CONF_LDP_DEBUG(zebra, LDP_DEBUG_ZEBRA)) {
                vty_out (vty, "debug mpls ldp zebra\n");
                write = 1;
        }