Add "no debug ospf" and "no debug ospf6" commands to disable all ospf debugging

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>
Ticket: CM-4010

diff --git a/ospf6d/ospf6_lsa.h b/ospf6d/ospf6_lsa.h
index aa64a772f8b8fa4f5e0c5d668343aa2c430e20f3..940a0f70571e5957a9353c41770a3697e62e071d 100644 (file)
--- a/ospf6d/ospf6_lsa.h
+++ b/ospf6d/ospf6_lsa.h
@@ -158,6 +158,8 @@ extern struct ospf6_lsa_handler unknown_handler;
 #define OSPF6_LSA_IS_KNOWN(type) \
   (ospf6_get_lsa_handler (type) != &unknown_handler ? 1 : 0)
 
+extern vector ospf6_lsa_handler_vector;
+
 /* Macro for LSA Origination */
 /* addr is (struct prefix *) */
 #define CONTINUE_IF_ADDRESS_LINKLOCAL(debug,addr)      \

diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c
index 6f9c8bb4f8e49a6ae7c68907c73e3f53a79b8a41..49b4aceaeb163aa70a14baf02983a500c6a33889 100644 (file)
--- a/ospf6d/ospf6_neighbor.c
+++ b/ospf6d/ospf6_neighbor.c
@@ -40,6 +40,11 @@
 #include "ospf6_flood.h"
 #include "ospf6d.h"
 #include "ospf6_bfd.h"
+#include "ospf6_abr.h"
+#include "ospf6_asbr.h"
+#include "ospf6_lsa.h"
+#include "ospf6_spf.h"
+#include "ospf6_zebra.h"
 
 unsigned char conf_debug_ospf6_neighbor = 0;
 
@@ -987,6 +992,50 @@ ALIAS (no_debug_ospf6_neighbor,
        "Debug OSPFv3 Neighbor Event\n"
       )
 
+DEFUN (no_debug_ospf6,
+       no_debug_ospf6_cmd,
+       "no debug ospf6",
+       NO_STR
+       DEBUG_STR
+       OSPF6_STR)
+{
+  u_int i;
+  struct ospf6_lsa_handler *handler = NULL;
+
+  OSPF6_DEBUG_ABR_OFF ();
+  OSPF6_DEBUG_ASBR_OFF ();
+  OSPF6_DEBUG_BROUTER_OFF ();
+  OSPF6_DEBUG_BROUTER_SPECIFIC_ROUTER_OFF ();
+  OSPF6_DEBUG_BROUTER_SPECIFIC_AREA_OFF ();
+  OSPF6_DEBUG_FLOODING_OFF ();
+  OSPF6_DEBUG_INTERFACE_OFF ();
+
+  for (i = 0; i < vector_active (ospf6_lsa_handler_vector); i++)
+    {
+      handler = vector_slot (ospf6_lsa_handler_vector, i);
+
+      if (handler != NULL)
+        {
+          UNSET_FLAG (handler->debug, OSPF6_LSA_DEBUG);
+        }
+    }
+
+  for (i = 0; i < 6; i++)
+    OSPF6_DEBUG_MESSAGE_OFF (i, OSPF6_DEBUG_NEIGHBOR_STATE | OSPF6_DEBUG_NEIGHBOR_EVENT);
+
+  OSPF6_DEBUG_NEIGHBOR_OFF (OSPF6_DEBUG_NEIGHBOR_STATE | OSPF6_DEBUG_NEIGHBOR_EVENT);
+  OSPF6_DEBUG_ROUTE_OFF (OSPF6_DEBUG_ROUTE_TABLE);
+  OSPF6_DEBUG_ROUTE_OFF (OSPF6_DEBUG_ROUTE_INTRA);
+  OSPF6_DEBUG_ROUTE_OFF (OSPF6_DEBUG_ROUTE_INTER);
+  OSPF6_DEBUG_ROUTE_OFF (OSPF6_DEBUG_ROUTE_MEMORY);
+  OSPF6_DEBUG_SPF_OFF (OSPF6_DEBUG_SPF_PROCESS);
+  OSPF6_DEBUG_SPF_OFF (OSPF6_DEBUG_SPF_TIME);
+  OSPF6_DEBUG_SPF_OFF (OSPF6_DEBUG_SPF_DATABASE);
+  OSPF6_DEBUG_ZEBRA_OFF (OSPF6_DEBUG_ZEBRA_SEND | OSPF6_DEBUG_ZEBRA_RECV);
+
+  return CMD_SUCCESS;
+}
+
 int
 config_write_ospf6_debug_neighbor (struct vty *vty)
 {
@@ -1007,10 +1056,12 @@ install_element_ospf6_debug_neighbor (void)
   install_element (ENABLE_NODE, &debug_ospf6_neighbor_detail_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf6_neighbor_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf6_neighbor_detail_cmd);
+  install_element (ENABLE_NODE, &no_debug_ospf6_cmd);
   install_element (CONFIG_NODE, &debug_ospf6_neighbor_cmd);
   install_element (CONFIG_NODE, &debug_ospf6_neighbor_detail_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf6_neighbor_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf6_neighbor_detail_cmd);
+  install_element (CONFIG_NODE, &no_debug_ospf6_cmd);
 }
 
 

diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c
index 9c73e1b2bede8ded53c51765ac5132abaf7f71c3..4c1f0549ebbc0ab115fde4f49f49dbc1ebcc66ac 100644 (file)
--- a/ospfd/ospf_dump.c
+++ b/ospfd/ospf_dump.c
@@ -1922,6 +1922,64 @@ DEFUN (no_debug_ospf_instance_nssa,
   return CMD_SUCCESS;
 }
 
+DEFUN (no_debug_ospf,
+       no_debug_ospf_cmd,
+       "no debug ospf",
+       NO_STR
+       DEBUG_STR
+       OSPF_STR)
+{
+  int flag = OSPF_DEBUG_SEND | OSPF_DEBUG_RECV | OSPF_DEBUG_DETAIL;
+  int i;
+
+  if (vty->node == CONFIG_NODE)
+    {
+      CONF_DEBUG_OFF (event, EVENT);
+      CONF_DEBUG_OFF (nssa, NSSA);
+      DEBUG_OFF (ism, ISM_EVENTS);
+      DEBUG_OFF (ism, ISM_STATUS);
+      DEBUG_OFF (ism, ISM_TIMERS);
+      DEBUG_OFF (lsa, LSA);
+      DEBUG_OFF (lsa, LSA_FLOODING);
+      DEBUG_OFF (lsa, LSA_GENERATE);
+      DEBUG_OFF (lsa, LSA_INSTALL);
+      DEBUG_OFF (lsa, LSA_REFRESH);
+      DEBUG_OFF (nsm, NSM);
+      DEBUG_OFF (nsm, NSM_EVENTS);
+      DEBUG_OFF (nsm, NSM_STATUS);
+      DEBUG_OFF (nsm, NSM_TIMERS);
+      DEBUG_OFF (zebra, ZEBRA);
+      DEBUG_OFF (zebra, ZEBRA_INTERFACE);
+      DEBUG_OFF (zebra, ZEBRA_REDISTRIBUTE);
+
+      for (i = 0; i < 5; i++)
+        DEBUG_PACKET_OFF (i, flag);
+    }
+
+  for (i = 0; i < 5; i++)
+    TERM_DEBUG_PACKET_OFF (i, flag);
+
+  TERM_DEBUG_OFF (event, EVENT);
+  TERM_DEBUG_OFF (ism, ISM);
+  TERM_DEBUG_OFF (ism, ISM_EVENTS);
+  TERM_DEBUG_OFF (ism, ISM_STATUS);
+  TERM_DEBUG_OFF (ism, ISM_TIMERS);
+  TERM_DEBUG_OFF (lsa, LSA);
+  TERM_DEBUG_OFF (lsa, LSA_FLOODING);
+  TERM_DEBUG_OFF (lsa, LSA_GENERATE);
+  TERM_DEBUG_OFF (lsa, LSA_INSTALL);
+  TERM_DEBUG_OFF (lsa, LSA_REFRESH);
+  TERM_DEBUG_OFF (nsm, NSM);
+  TERM_DEBUG_OFF (nsm, NSM_EVENTS);
+  TERM_DEBUG_OFF (nsm, NSM_STATUS);
+  TERM_DEBUG_OFF (nsm, NSM_TIMERS);
+  TERM_DEBUG_OFF (nssa, NSSA);
+  TERM_DEBUG_OFF (zebra, ZEBRA);
+  TERM_DEBUG_OFF (zebra, ZEBRA_INTERFACE);
+  TERM_DEBUG_OFF (zebra, ZEBRA_REDISTRIBUTE);
+
+  return CMD_SUCCESS;
+}
 
 static int
 show_debugging_ospf_common (struct vty *vty, struct ospf *ospf)
@@ -2254,6 +2312,7 @@ debug_init ()
   install_element (ENABLE_NODE, &no_debug_ospf_instance_zebra_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_instance_event_cmd);
   install_element (ENABLE_NODE, &no_debug_ospf_instance_nssa_cmd);
+  install_element (ENABLE_NODE, &no_debug_ospf_cmd);
 
   install_element (CONFIG_NODE, &debug_ospf_packet_send_recv_detail_cmd);
   install_element (CONFIG_NODE, &debug_ospf_packet_send_recv_cmd);
@@ -2308,4 +2367,5 @@ debug_init ()
   install_element (CONFIG_NODE, &no_debug_ospf_instance_zebra_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_instance_event_cmd);
   install_element (CONFIG_NODE, &no_debug_ospf_instance_nssa_cmd);
+  install_element (CONFIG_NODE, &no_debug_ospf_cmd);
 }