yang, ripd: add 'frr-ripd.yang' and associated stub callbacks

[mirror_frr.git] / ripd / rip_main.c

diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index 0194e5312802d5a2a48226158352c41d4a9cb16e..23981d6d6651952c11a036a2d3a9ec14c3082bec 100644 (file)
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -37,6 +37,7 @@
 #include "libfrr.h"
 
 #include "ripd/ripd.h"
+#include "ripd/rip_errors.h"
 
 /* ripd options. */
 #if CONFDATE > 20190521
@@ -75,7 +76,7 @@ static void sighup(void)
        zlog_info("ripd restarting!");
 
        /* Reload config file. */
-       vty_read_config(ripd_di.config_file, config_default);
+       vty_read_config(NULL, ripd_di.config_file, config_default);
 
        /* Try to return to normal operation. */
 }
@@ -118,13 +119,19 @@ static struct quagga_signal_t ripd_signals[] = {
        },
 };
 
+static const struct frr_yang_module_info *ripd_yang_modules[] = {
+       &frr_interface_info,
+       &frr_ripd_info,
+};
+
 FRR_DAEMON_INFO(ripd, RIP, .vty_port = RIP_VTY_PORT,
 
                .proghelp = "Implementation of the RIP routing protocol.",
 
                .signals = ripd_signals, .n_signals = array_size(ripd_signals),
 
-               .privs = &ripd_privs, )
+               .privs = &ripd_privs, .yang_modules = ripd_yang_modules,
+               .n_yang_modules = array_size(ripd_yang_modules), )
 
 #if CONFDATE > 20190521
 CPP_NOTICE("-r / --retain has reached deprecation EOL, remove")
@@ -167,12 +174,14 @@ int main(int argc, char **argv)
        master = frr_init();
 
        /* Library initialization. */
+       rip_error_init();
        keychain_init();
-       vrf_init(NULL, NULL, NULL, NULL);
+       vrf_init(NULL, NULL, NULL, NULL, NULL);
 
        /* RIP related initialization. */
        rip_init();
        rip_if_init();
+       rip_cli_init();
        rip_zclient_init(master);
        rip_peer_init();