Merge pull request #5580 from mjstapp/zebra_nhg_debug_category

[mirror_frr.git] / isisd / isis_main.c

diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index 48ae760173511e4d8a18681a6e30e67355444f85..364441f79d92f7de34f434b7c8b5f98a1bce6c25 100644 (file)
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -29,7 +29,6 @@
 #include "command.h"
 #include "vty.h"
 #include "memory.h"
-#include "memory_vty.h"
 #include "stream.h"
 #include "if.h"
 #include "privs.h"
@@ -53,11 +52,11 @@
 #include "isisd/isis_zebra.h"
 #include "isisd/isis_te.h"
 #include "isisd/isis_errors.h"
-#include "isisd/isis_vty_common.h"
 #include "isisd/isis_bfd.h"
 #include "isisd/isis_lsp.h"
 #include "isisd/isis_mt.h"
 #include "isisd/fabricd.h"
+#include "isisd/isis_nb.h"
 
 /* Default configuration file name */
 #define ISISD_DEFAULT_CONFIG "isisd.conf"
@@ -162,7 +161,7 @@ struct quagga_signal_t isisd_signals[] = {
 };
 
 
-static const struct frr_yang_module_info *isisd_yang_modules[] = {
+static const struct frr_yang_module_info *const isisd_yang_modules[] = {
        &frr_interface_info,
 #ifndef FABRICD
        &frr_isisd_info,
@@ -230,7 +229,9 @@ int main(int argc, char **argv, char **envp)
        prefix_list_init();
        isis_init();
        isis_circuit_init();
-       isis_vty_init();
+#ifdef FABRICD
+       isis_vty_daemon_init();
+#endif /* FABRICD */
 #ifndef FABRICD
        isis_cli_init();
 #endif /* ifdef FABRICD */
@@ -242,7 +243,7 @@ int main(int argc, char **argv, char **envp)
        mt_init();
 
        /* create the global 'isis' instance */
-       isis_new(1);
+       isis_new(1, VRF_DEFAULT);
 
        isis_zebra_init(master);
        isis_bfd_init();