ripd: Make sure we do not overuse higher values for ECMP count

Use a minimum value of a CLI version and a value of Zebra capabilities.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>

diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index 0e26662cdb5ca9b815568666fd0f603e0255d2af..ac358ebbaf58b70adafa504b97c8620480a71a29 100644 (file)
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -34,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,

diff --git a/ripd/rip_nb_config.c b/ripd/rip_nb_config.c
index 1117ec9ff7a5112c6b1831e9cf9491554ee0f4aa..8d3b6705968a630d23e5ca4d770dbd3e781f3c83 100644 (file)
--- a/ripd/rip_nb_config.c
+++ b/ripd/rip_nb_config.c
@@ -99,7 +99,8 @@ int ripd_instance_allow_ecmp_modify(struct nb_cb_modify_args *args)
                return NB_OK;
 
        rip = nb_running_get_entry(args->dnode, NULL, true);
-       rip->ecmp = yang_dnode_get_uint8(args->dnode, NULL);
+       rip->ecmp =
+               MIN(yang_dnode_get_uint8(args->dnode, NULL), zebra_ecmp_count);
        if (!rip->ecmp) {
                rip_ecmp_disable(rip);
                return NB_OK;

diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c
index 834c7d2d6519a96b87ac29fb0131da32aed64589..5bf51c2f15284bc171fcc044cf371a2704a0fce9 100644 (file)
--- a/ripd/rip_zebra.c
+++ b/ripd/rip_zebra.c
@@ -20,7 +20,6 @@
 
 /* All information about zebra. */
 struct zclient *zclient = NULL;
-uint32_t zebra_ecmp_count = MULTIPATH_NUM;
 
 /* Send ECMP routes to zebra. */
 static void rip_zebra_ipv4_send(struct rip *rip, struct route_node *rp,

diff --git a/ripd/ripd.h b/ripd/ripd.h
index 2db1e5a6b0ee62bb956c03b5fc28374f7da2e569..ac4a51f586fda4e05b1a4ad43a651cdf70c8247b 100644 (file)
--- a/ripd/ripd.h
+++ b/ripd/ripd.h
@@ -539,4 +539,6 @@ DECLARE_HOOK(rip_ifaddr_del, (struct connected * ifc), (ifc));
 
 extern void rip_ecmp_change(struct rip *rip);
 
+extern uint32_t zebra_ecmp_count;
+
 #endif /* _ZEBRA_RIP_H */