Merge pull request #13548 from opensourcerouting/fix/use_min_value_of_cli_zebra_cap_ecmp

[mirror_frr.git] / ripd / rip_main.c

diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index e26424adeb63b0c275ebeb7339f569af9432e5f2..ac358ebbaf58b70adafa504b97c8620480a71a29 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"
 
@@ -32,6 +34,8 @@ static struct option longopts[] = {{0}};
 /* ripd privileges */
 zebra_capabilities_t _caps_p[] = {ZCAP_NET_RAW, ZCAP_BIND, ZCAP_SYS_ADMIN};
 
+uint32_t zebra_ecmp_count = MULTIPATH_NUM;
+
 struct zebra_privs_t ripd_privs = {
 #if defined(FRR_USER)
        .user = FRR_USER,
@@ -47,7 +51,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 +69,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 +167,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);