zebra: Allow ns delete to happen after under/over flow checks

[mirror_frr.git] / eigrpd / eigrp_main.c

diff --git a/eigrpd/eigrp_main.c b/eigrpd/eigrp_main.c
index 4c99821d3c4b98ab8a5aca3e2c7820218621c785..063fc5fec10dc61366e4ece1692921b32dc95005 100644 (file)
--- a/eigrpd/eigrp_main.c
+++ b/eigrpd/eigrp_main.c
@@ -64,6 +64,7 @@
 #include "eigrpd/eigrp_network.h"
 #include "eigrpd/eigrp_snmp.h"
 #include "eigrpd/eigrp_filter.h"
+#include "eigrpd/eigrp_errors.h"
 //#include "eigrpd/eigrp_routemap.h"
 
 /* eigprd privileges */
@@ -100,6 +101,8 @@ static void sigint(void)
 {
        zlog_notice("Terminating on signal");
        eigrp_terminate();
+
+       exit(0);
 }
 
 /* SIGUSR1 handler. */
@@ -127,6 +130,10 @@ struct quagga_signal_t eigrp_signals[] = {
        },
 };
 
+static const struct frr_yang_module_info *eigrpd_yang_modules[] = {
+       &frr_interface_info,
+};
+
 FRR_DAEMON_INFO(eigrpd, EIGRP, .vty_port = EIGRP_VTY_PORT,
 
                .proghelp = "Implementation of the EIGRP routing protocol.",
@@ -134,7 +141,8 @@ FRR_DAEMON_INFO(eigrpd, EIGRP, .vty_port = EIGRP_VTY_PORT,
                .signals = eigrp_signals,
                .n_signals = array_size(eigrp_signals),
 
-               .privs = &eigrpd_privs, )
+               .privs = &eigrpd_privs, .yang_modules = eigrpd_yang_modules,
+               .n_yang_modules = array_size(eigrpd_yang_modules), )
 
 /* EIGRPd main routine. */
 int main(int argc, char **argv, char **envp)
@@ -159,12 +167,15 @@ int main(int argc, char **argv, char **envp)
                }
        }
 
+       eigrp_sw_version_initialize();
+
        /* EIGRP master init. */
        eigrp_master_init();
        eigrp_om->master = frr_init();
        master = eigrp_om->master;
 
-       vrf_init(NULL, NULL, NULL, NULL);
+       eigrp_error_init();
+       vrf_init(NULL, NULL, NULL, NULL, NULL);
 
        /*EIGRPd init*/
        eigrp_if_init();