staticd: capture zebra's advertised ECMP limit

Capture the ECMP limit advertised by zebra (via zapi).

Signed-off-by: Mark Stapp <mstapp@nvidia.com>
(cherry picked from commit abc246e19345cbd2bc74c7dc50dac0b9cf2addf8)

diff --git a/staticd/static_main.c b/staticd/static_main.c
index 6051b2df1c8febc3c5acd24620a8e4f2c91bf6be..3bd784b59453860019e556ae7c2af12dc5c0e9af 100644 (file)
--- a/staticd/static_main.c
+++ b/staticd/static_main.c
@@ -43,7 +43,7 @@
 char backup_config_file[256];
 
 bool mpls_enabled;
-
+uint32_t zebra_ecmp_count = MULTIPATH_NUM;
 
 zebra_capabilities_t _caps_p[] = {
 };

diff --git a/staticd/static_routes.h b/staticd/static_routes.h
index c901a8926a437a2352914131c31b67eda497389d..71c3689be54ad3eb60e6d41b64a7350cda18721e 100644 (file)
--- a/staticd/static_routes.h
+++ b/staticd/static_routes.h
@@ -163,6 +163,7 @@ static_route_info_from_rnode(struct route_node *rn)
 }
 
 extern bool mpls_enabled;
+extern uint32_t zebra_ecmp_count;
 
 extern struct zebra_privs_t static_privs;
 

diff --git a/staticd/static_zebra.c b/staticd/static_zebra.c
index 311aeda3385118fef6cb7123c612585852f8fb83..a62225294aedc48552f760c6f4d285a050c59bab 100644 (file)
--- a/staticd/static_zebra.c
+++ b/staticd/static_zebra.c
@@ -205,6 +205,7 @@ static int static_zebra_nexthop_update(ZAPI_CALLBACK_ARGS)
 static void static_zebra_capabilities(struct zclient_capabilities *cap)
 {
        mpls_enabled = cap->mpls_enabled;
+       zebra_ecmp_count = cap->ecmp;
 }
 
 static unsigned int static_nht_hash_key(const void *data)