Merge pull request #13438 from gpnaveen/vrf_on_loopback

[mirror_frr.git] / ripd / rip_main.c

diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index e26424adeb63b0c275ebeb7339f569af9432e5f2..0e26662cdb5ca9b815568666fd0f603e0255d2af 100644 (file)
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -7,7 +7,7 @@
 
 #include <lib/version.h>
 #include "getopt.h"
-#include "thread.h"
+#include "frrevent.h"
 #include "command.h"
 #include "memory.h"
 #include "prefix.h"
@@ -21,8 +21,10 @@
 #include "if_rmap.h"
 #include "libfrr.h"
 #include "routemap.h"
+#include "bfd.h"
 
 #include "ripd/ripd.h"
+#include "ripd/rip_bfd.h"
 #include "ripd/rip_nb.h"
 #include "ripd/rip_errors.h"
 
@@ -47,7 +49,7 @@ struct zebra_privs_t ripd_privs = {
        .cap_num_i = 0};
 
 /* Master of threads. */
-struct thread_master *master;
+struct event_loop *master;
 
 static struct frr_daemon_info ripd_di;
 
@@ -65,6 +67,7 @@ static void sigint(void)
 {
        zlog_notice("Terminating on signal");
 
+       bfd_protocol_integration_set_shutdown(true);
        rip_vrf_terminate();
        if_rmap_terminate();
        rip_zclient_stop();
@@ -162,6 +165,7 @@ int main(int argc, char **argv)
        rip_if_init();
        rip_cli_init();
        rip_zclient_init(master);
+       rip_bfd_init(master);
 
        frr_config_fork();
        frr_run(master);