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

Jump to bottom

bgpd: fix consider in NHT BGP update with same prefix/nexthop #17428

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −1
Draft

bgpd: fix consider in NHT BGP update with same prefix/nexthop #17428

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
7 changes: 6 additions & 1 deletion bgpd/bgp_nht.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ int bgp_find_or_add_nexthop(struct bgp *bgp_route, struct bgp *bgp_nexthop,
uint32_t srte_color = 0;
int is_bgp_static_route = 0;
ifindex_t ifindex = 0;
bool invalid_resolution = false;

if (pi) {
is_bgp_static_route = ((pi->type == ZEBRA_ROUTE_BGP)
Expand Down Expand Up @@ -353,7 +354,7 @@ int bgp_find_or_add_nexthop(struct bgp *bgp_route, struct bgp *bgp_nexthop,
zlog_debug("%s(%pFX): prefix loops through itself (import-check enabled)",
__func__, &p);
}
return 0;
invalid_resolution = true;
}

srte_color = bgp_attr_get_color(pi->attr);
Expand Down Expand Up @@ -394,6 +395,8 @@ int bgp_find_or_add_nexthop(struct bgp *bgp_route, struct bgp *bgp_nexthop,

bnc = bnc_find(tree, &p, srte_color, ifindex);
if (!bnc) {
if (invalid_resolution)
return 0;
bnc = bnc_new(tree, &p, srte_color, ifindex);
bnc->afi = afi;
bnc->bgp = bgp_nexthop;
Expand All @@ -409,6 +412,8 @@ int bgp_find_or_add_nexthop(struct bgp *bgp_route, struct bgp *bgp_nexthop,
bnc->bgp->name_pretty, bnc->flags,
bnc->ifindex_ipv6_ll, bnc->path_count,
bnc->nht_info, &bnc->resolved_prefix);
if (invalid_resolution)
return 1;
}

if (pi && is_route_parent_evpn(pi))
Expand Down
Loading