isisd: implemented the 'sequence-number-skipped' notification

[mirror_frr.git] / isisd / isis_main.c

diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index 474184fbd31290f1e8f0a0b91978dd3f3ad0bd1d..40c483a0dbc05330298a5dead4ca980a205759ab 100644 (file)
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -57,6 +57,8 @@
 #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"
 
 /* Default configuration file name */
 #define ISISD_DEFAULT_CONFIG "isisd.conf"
@@ -149,6 +151,14 @@ struct quagga_signal_t isisd_signals[] = {
        },
 };
 
+
+static const struct frr_yang_module_info *isisd_yang_modules[] = {
+       &frr_interface_info,
+#ifndef FABRICD
+       &frr_isisd_info,
+#endif /* ifndef FABRICD */
+};
+
 #ifdef FABRICD
 FRR_DAEMON_INFO(fabricd, OPEN_FABRIC, .vty_port = FABRICD_VTY_PORT,
 
@@ -165,7 +175,8 @@ FRR_DAEMON_INFO(isisd, ISIS, .vty_port = ISISD_VTY_PORT,
                .signals = isisd_signals,
                .n_signals = array_size(isisd_signals),
 
-               .privs = &isisd_privs, )
+               .privs = &isisd_privs, .yang_modules = isisd_yang_modules,
+               .n_yang_modules = array_size(isisd_yang_modules), )
 
 /*
  * Main routine of isisd. Parse arguments and handle IS-IS state machine.
@@ -197,7 +208,6 @@ int main(int argc, char **argv, char **envp)
                }
        }
 
-       vty_config_lockless();
        /* thread master */
        master = frr_init();
 
@@ -211,17 +221,22 @@ int main(int argc, char **argv, char **envp)
        isis_init();
        isis_circuit_init();
        isis_vty_init();
+#ifndef FABRICD
+       isis_cli_init();
+#endif /* ifdef FABRICD */
        isis_spf_cmds_init();
        isis_redist_init();
        isis_route_map_init();
        isis_mpls_te_init();
        lsp_init();
+       mt_init();
 
        /* create the global 'isis' instance */
        isis_new(1);
 
        isis_zebra_init(master);
        isis_bfd_init();
+       fabricd_init();
 
        frr_config_fork();
        frr_run(master);