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

[mirror_frr.git] / ripngd / ripng_main.c

diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index e4501d6f80aa5d1687c01e9e6dea86fb69b08be0..10e19efe77f6962fc39cea79f2378adcb0a52f1c 100644 (file)
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -72,13 +72,9 @@ static struct frr_daemon_info ripngd_di;
 static void sighup(void)
 {
        zlog_info("SIGHUP received");
-       ripng_clean();
-       ripng_reset();
 
        /* Reload config file. */
-       vty_read_config(ripngd_di.config_file, config_default);
-
-       /* Try to return to normal operation. */
+       vty_read_config(NULL, ripngd_di.config_file, config_default);
 }
 
 /* SIGINT handler. */
@@ -118,6 +114,11 @@ struct quagga_signal_t ripng_signals[] = {
        },
 };
 
+static const struct frr_yang_module_info *ripngd_yang_modules[] = {
+       &frr_interface_info,
+       &frr_ripngd_info,
+};
+
 FRR_DAEMON_INFO(ripngd, RIPNG, .vty_port = RIPNG_VTY_PORT,
 
                .proghelp = "Implementation of the RIPng routing protocol.",
@@ -125,7 +126,10 @@ FRR_DAEMON_INFO(ripngd, RIPNG, .vty_port = RIPNG_VTY_PORT,
                .signals = ripng_signals,
                .n_signals = array_size(ripng_signals),
 
-               .privs = &ripngd_privs, )
+               .privs = &ripngd_privs,
+
+               .yang_modules = ripngd_yang_modules,
+               .n_yang_modules = array_size(ripngd_yang_modules), )
 
 #if CONFDATE > 20190521
 CPP_NOTICE("-r / --retain has reached deprecation EOL, remove")
@@ -166,10 +170,11 @@ int main(int argc, char **argv)
        master = frr_init();
 
        /* Library inits. */
-       vrf_init(NULL, NULL, NULL, NULL);
+       vrf_init(NULL, NULL, NULL, NULL, NULL);
 
        /* RIPngd inits. */
        ripng_init();
+       ripng_cli_init();
        zebra_init(master);
        ripng_peer_init();