Skip to content

Commit

Permalink
zebra: Send nht resolved entry up to concerned protocols in all cases
Browse files Browse the repository at this point in the history
There existed the idea, from Volta, that a nexthop group would not have
the same nexthops installed -vs- what FRR actually sent down.  The
dplane would notify you.

With the addition of 06525c4
the code was put behind a bit of a wall controlled the usage
of it.

The flag ROUTE_ENTRY_USE_FIB_NHG flag was being used
to control which set was being sent up to concerned parties
in nexthop tracking.  Put this flag behind the wall and
do not necessarily set it when we receive a data plane
notification about a route being installed or not.

Fixes: #12706
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
  • Loading branch information
donaldsharp committed Jan 31, 2023
1 parent 9eca0bd commit 8ce0e51
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions zebra/zebra_rib.c
Original file line number Diff line number Diff line change
Expand Up @@ -1788,9 +1788,12 @@ static bool rib_update_re_from_ctx(struct route_entry *re,
ctxnhg->nexthop != NULL ? "" : " (empty)");

/* Set the flag about the dedicated fib list */
SET_FLAG(re->status, ROUTE_ENTRY_USE_FIB_NHG);
if (ctxnhg->nexthop)
copy_nexthops(&(re->fib_ng.nexthop), ctxnhg->nexthop, NULL);
if (zrouter.asic_notification_nexthop_control) {
SET_FLAG(re->status, ROUTE_ENTRY_USE_FIB_NHG);
if (ctxnhg->nexthop)
copy_nexthops(&(re->fib_ng.nexthop), ctxnhg->nexthop,
NULL);
}

check_backups:

Expand Down

0 comments on commit 8ce0e51

Please sign in to comment.