Skip to content

Suppress fib funny business #15634

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

Merged
ton31337 merged 2 commits into from
Apr 3, 2024
Merged

Suppress fib funny business #15634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c60314
bgpd: Note when receiving but not understanding a route notification
donaldsharp Mar 28, 2024
329d5a5
bgpd: Arrange peer notification to after zebra announce
donaldsharp Mar 28, 2024
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
17 changes: 9 additions & 8 deletions bgpd/bgp_route.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3498,14 +3498,6 @@ static void bgp_process_main_one(struct bgp *bgp, struct bgp_dest *dest,
}
#endif

group_announce_route(bgp, afi, safi, dest, new_select);

/* unicast routes must also be annouced to labeled-unicast update-groups
*/
if (safi == SAFI_UNICAST)
group_announce_route(bgp, afi, SAFI_LABELED_UNICAST, dest,
new_select);

/* FIB update. */
if (bgp_fibupd_safi(safi) && (bgp->inst_type != BGP_INSTANCE_TYPE_VIEW)
&& !bgp_option_check(BGP_OPT_NO_FIB)) {
Expand Down Expand Up @@ -3537,6 +3529,15 @@ static void bgp_process_main_one(struct bgp *bgp, struct bgp_dest *dest,
}
}

group_announce_route(bgp, afi, safi, dest, new_select);

/* unicast routes must also be annouced to labeled-unicast update-groups
*/
if (safi == SAFI_UNICAST)
group_announce_route(bgp, afi, SAFI_LABELED_UNICAST, dest,
new_select);


bgp_process_evpn_route_injection(bgp, afi, safi, dest, new_select,
old_select);

Expand Down
6 changes: 5 additions & 1 deletion bgpd/bgp_zebra.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2749,8 +2749,12 @@ static int bgp_zebra_route_notify_owner(int command, struct zclient *zclient,
/* Find the bgp route node */
dest = bgp_safi_node_lookup(bgp->rib[afi][safi], safi, &p,
&bgp->vrf_prd);
if (!dest)
if (!dest) {
if (BGP_DEBUG(zebra, ZEBRA))
zlog_debug("%s: %pFX does not exist in the BGP table, nothing to do for %u",
__func__, &p, note);
return -1;
}

switch (note) {
case ZAPI_ROUTE_INSTALLED:
Expand Down