proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 10:04:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15663 from FRRouting/mergify/bp/stable/9.1/pr-15634

Browse Source 
Suppress fib funny business (backport #15634)
This commit is contained in:
Donatas Abraitis 2024-04-03 22:33:12 +03:00 committed by GitHub
commit c3d12673a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bgpd/bgp_route.c
View File

@ -3465,14 +3465,6 @@ static void bgp_process_main_one(struct bgp *bgp, struct bgp_dest *dest,
} }
#endif #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. */ /* FIB update. */
if (bgp_fibupd_safi(safi) && (bgp->inst_type != BGP_INSTANCE_TYPE_VIEW) if (bgp_fibupd_safi(safi) && (bgp->inst_type != BGP_INSTANCE_TYPE_VIEW)
&& !bgp_option_check(BGP_OPT_NO_FIB)) { && !bgp_option_check(BGP_OPT_NO_FIB)) {
@ -3502,6 +3494,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, bgp_process_evpn_route_injection(bgp, afi, safi, dest, new_select,
old_select); old_select);

6
bgpd/bgp_zebra.c
View File

@ -2605,8 +2605,12 @@ static int bgp_zebra_route_notify_owner(int command, struct zclient *zclient,
/* Find the bgp route node */ /* Find the bgp route node */
dest = bgp_safi_node_lookup(bgp->rib[afi][safi], safi, &p, dest = bgp_safi_node_lookup(bgp->rib[afi][safi], safi, &p,
&bgp->vrf_prd); &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; return -1;
}
switch (note) { switch (note) {
case ZAPI_ROUTE_INSTALLED: case ZAPI_ROUTE_INSTALLED: