proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 13:27:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11096 from anlancs/fix/bgpd-unlock

Browse Source 
bgpd: clear misleading mismatched check
This commit is contained in:
Russ White 2022-05-09 10:46:50 -04:00 committed by GitHub
commit 22d9780f3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bgpd/bgp_evpn.c
View File

@ -2147,7 +2147,7 @@ static int update_all_type2_routes(struct bgp *bgp, struct bgpevpn *vpn)
* Delete all type-2 (MACIP) local routes for this VNI - only from the * Delete all type-2 (MACIP) local routes for this VNI - only from the
* global routing table. These are also scheduled for withdraw from peers. * global routing table. These are also scheduled for withdraw from peers.
*/ */
static int delete_global_type2_routes(struct bgp *bgp, struct bgpevpn *vpn) static void delete_global_type2_routes(struct bgp *bgp, struct bgpevpn *vpn)
{ {
afi_t afi; afi_t afi;
safi_t safi; safi_t safi;
@ -2160,7 +2160,7 @@ static int delete_global_type2_routes(struct bgp *bgp, struct bgpevpn *vpn)
rddest = bgp_node_lookup(bgp->rib[afi][safi], rddest = bgp_node_lookup(bgp->rib[afi][safi],
(struct prefix *)&vpn->prd); (struct prefix *)&vpn->prd);
if (rddest && bgp_dest_has_bgp_path_info_data(rddest)) { if (rddest) {
table = bgp_dest_get_bgp_table_info(rddest); table = bgp_dest_get_bgp_table_info(rddest);
for (dest = bgp_table_top(table); dest; for (dest = bgp_table_top(table); dest;
dest = bgp_route_next(dest)) { dest = bgp_route_next(dest)) {
@ -2175,13 +2175,10 @@ static int delete_global_type2_routes(struct bgp *bgp, struct bgpevpn *vpn)
if (pi) if (pi)
bgp_process(bgp, dest, afi, safi); bgp_process(bgp, dest, afi, safi);
} }
}
/* Unlock RD node. */ /* Unlock RD node. */
if (rddest)
bgp_dest_unlock_node(rddest); bgp_dest_unlock_node(rddest);
}
return 0;
} }
/* /*
@ -3704,7 +3701,6 @@ static int update_advertise_vni_routes(struct bgp *bgp, struct bgpevpn *vpn)
*/ */
static int delete_withdraw_vni_routes(struct bgp *bgp, struct bgpevpn *vpn) static int delete_withdraw_vni_routes(struct bgp *bgp, struct bgpevpn *vpn)
{ {
int ret;
struct prefix_evpn p; struct prefix_evpn p;
struct bgp_dest *global_dest; struct bgp_dest *global_dest;
struct bgp_path_info *pi; struct bgp_path_info *pi;
@ -3714,9 +3710,7 @@ static int delete_withdraw_vni_routes(struct bgp *bgp, struct bgpevpn *vpn)
/* Delete and withdraw locally learnt type-2 routes (MACIP) /* Delete and withdraw locally learnt type-2 routes (MACIP)
* for this VNI - from the global table. * for this VNI - from the global table.
*/ */
ret = delete_global_type2_routes(bgp, vpn); delete_global_type2_routes(bgp, vpn);
if (ret)
return ret;
/* Remove type-3 route for this VNI from global table. */ /* Remove type-3 route for this VNI from global table. */
build_evpn_type3_prefix(&p, vpn->originator_ip); build_evpn_type3_prefix(&p, vpn->originator_ip);