summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Stapp <mjs@voltanet.io>2020-02-28 08:45:56 -0500
committerMark Stapp <mjs@voltanet.io>2020-02-28 08:45:56 -0500
commit97cd9bfc0745e96169b46ba93b7c88f6cdba1269 (patch)
tree08946b3c818435c7493e4b6e48f1a8a3c9903422
parent890b3450ead5ab90c0e415816ded89e3e00255f5 (diff)
zebra: fix nexthop_group conversion in fpm code
Recent commit that embedded the nhg_hash_entry's group missed a couple of fpm modules. Signed-off-by: Mark Stapp <mjs@voltanet.io>
-rw-r--r--zebra/zebra_fpm_dt.c2
-rw-r--r--zebra/zebra_fpm_protobuf.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/zebra/zebra_fpm_dt.c b/zebra/zebra_fpm_dt.c
index 389781d4f7..81437e72f5 100644
--- a/zebra/zebra_fpm_dt.c
+++ b/zebra/zebra_fpm_dt.c
@@ -90,7 +90,7 @@ static int zfpm_dt_find_route(rib_dest_t **dest_p, struct route_entry **re_p)
if (!re)
continue;
- if (nexthop_group_active_nexthop_num(re->nhe->nhg) == 0)
+ if (nexthop_group_active_nexthop_num(&(re->nhe->nhg)) == 0)
continue;
*dest_p = dest;
diff --git a/zebra/zebra_fpm_protobuf.c b/zebra/zebra_fpm_protobuf.c
index d50981debf..ade4b636d6 100644
--- a/zebra/zebra_fpm_protobuf.c
+++ b/zebra/zebra_fpm_protobuf.c
@@ -173,7 +173,7 @@ static Fpm__AddRoute *create_add_route_message(qpb_allocator_t *allocator,
* Figure out the set of nexthops to be added to the message.
*/
num_nhs = 0;
- for (ALL_NEXTHOPS_PTR(re->nhe->nhg, nexthop)) {
+ for (ALL_NEXTHOPS(re->nhe->nhg, nexthop)) {
if (num_nhs >= zrouter.multipath_num)
break;