Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zebra: Fix resetting valid flags for NHG dependents (backport #17731) #17741

Merged
merged 1 commit into from
Jan 4, 2025
Merged

zebra: Fix resetting valid flags for NHG dependents (backport #17731) #17741

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions zebra/zebra_nhg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1045,6 +1045,7 @@ static struct nhg_ctx *nhg_ctx_init(uint32_t id, struct nexthop *nh,
static void zebra_nhg_set_valid(struct nhg_hash_entry *nhe, bool valid)
{
struct nhg_connected *rb_node_dep;
bool dependent_valid = valid;

if (valid)
SET_FLAG(nhe->flags, NEXTHOP_GROUP_VALID);
Expand All @@ -1060,6 +1061,7 @@ static void zebra_nhg_set_valid(struct nhg_hash_entry *nhe, bool valid)

/* Update validity of nexthops depending on it */
frr_each (nhg_connected_tree, &nhe->nhg_dependents, rb_node_dep) {
dependent_valid = valid;
if (!valid) {
/*
* Grab the first nexthop from the depending nexthop group
Expand All @@ -1069,16 +1071,22 @@ static void zebra_nhg_set_valid(struct nhg_hash_entry *nhe, bool valid)
struct nexthop *nexthop = rb_node_dep->nhe->nhg.nexthop;

while (nexthop) {
if (nexthop_same(nexthop, nhe->nhg.nexthop))
break;

if (nexthop_same(nexthop, nhe->nhg.nexthop)) {
/* Invalid Nexthop */
UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE);
} else {
/*
* If other nexthops in the nexthop
* group are valid then we can continue
* to use this nexthop group as valid
*/
if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE))
dependent_valid = true;
}
nexthop = nexthop->next;
}

if (nexthop)
UNSET_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE);
}
zebra_nhg_set_valid(rb_node_dep->nhe, valid);
zebra_nhg_set_valid(rb_node_dep->nhe, dependent_valid);
}
}

Expand Down
Loading