Merge svn revision 975 from Zebra repository.
diff --git a/ospf6d/ospf6d.c b/ospf6d/ospf6d.c
index a67600a..b954172 100644
--- a/ospf6d/ospf6d.c
+++ b/ospf6d/ospf6d.c
@@ -41,6 +41,7 @@
#include "ospf6_intra.h"
#include "ospf6_asbr.h"
#include "ospf6_abr.h"
+#include "ospf6_flood.h"
#include "ospf6d.h"
char ospf6_daemon_version[] = OSPF6_DAEMON_VERSION;
@@ -111,6 +112,7 @@
config_write_ospf6_debug_route (vty);
config_write_ospf6_debug_asbr (vty);
config_write_ospf6_debug_abr (vty);
+ config_write_ospf6_debug_flood (vty);
vty_out (vty, "!%s", VNL);
return 0;
}
@@ -1717,6 +1719,18 @@
void
ospf6_init ()
{
+ ospf6_top_init ();
+ ospf6_area_init ();
+ ospf6_interface_init ();
+ ospf6_neighbor_init ();
+ ospf6_zebra_init ();
+
+ ospf6_lsa_init ();
+ ospf6_spf_init ();
+ ospf6_intra_init ();
+ ospf6_asbr_init ();
+ ospf6_abr_init ();
+
install_node (&debug_node, config_write_ospf6_debug);
install_element_ospf6_debug_message ();
@@ -1728,6 +1742,7 @@
install_element_ospf6_debug_route ();
install_element_ospf6_debug_asbr ();
install_element_ospf6_debug_abr ();
+ install_element_ospf6_debug_flood ();
install_element (VIEW_NODE, &show_version_ospf6_cmd);
install_element (ENABLE_NODE, &show_version_ospf6_cmd);
@@ -1818,18 +1833,6 @@
INSTALL (ENABLE, database_type_id_self_originated_cmd);
INSTALL (ENABLE, database_type_id_self_originated_detail_cmd);
- ospf6_top_init ();
- ospf6_area_init ();
- ospf6_interface_init ();
- ospf6_neighbor_init ();
- ospf6_zebra_init ();
-
- ospf6_lsa_init ();
- ospf6_spf_init ();
- ospf6_intra_init ();
- ospf6_asbr_init ();
- ospf6_abr_init ();
-
/* Make ospf protocol socket. */
ospf6_serv_sock ();
thread_add_read (master, ospf6_receive, NULL, ospf6_sock);