proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-05 11:20:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8836 from ton31337/fix/generalize_bgp_dest_locks

Browse Source 
bgpd: Call bgp_dest_unlock_node() inside bgp_adj_in_remove()
This commit is contained in:
Renato Westphal 2021-06-14 10:11:17 -03:00 committed by GitHub
commit 994624c48d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bgpd/bgp_advertise.c
View File

@ -205,6 +205,7 @@ void bgp_adj_in_remove(struct bgp_dest *dest, struct bgp_adj_in *bai)
{
bgp_attr_unintern(&bai->attr);
BGP_ADJ_IN_DEL(dest, bai);
bgp_dest_unlock_node(dest);
peer_unlock(bai->peer); /* adj_in peer reference */
XFREE(MTYPE_BGP_ADJ_IN, bai);
}
@ -223,10 +224,8 @@ bool bgp_adj_in_unset(struct bgp_dest *dest, struct peer *peer,
while (adj) {
adj_next = adj->next;
if (adj->peer == peer && adj->addpath_rx_id == addpath_id) {
if (adj->peer == peer && adj->addpath_rx_id == addpath_id)
bgp_adj_in_remove(dest, adj);
bgp_dest_unlock_node(dest);
}
adj = adj_next;
}

8
bgpd/bgp_route.c
View File

@ -5048,10 +5048,8 @@ static void bgp_clear_route_table(struct peer *peer, afi_t afi, safi_t safi,
while (ain) {
ain_next = ain->next;
if (ain->peer == peer) {
if (ain->peer == peer)
bgp_adj_in_remove(dest, ain);
bgp_dest_unlock_node(dest);
}
ain = ain_next;
}
@ -5157,10 +5155,8 @@ void bgp_clear_adj_in(struct peer *peer, afi_t afi, safi_t safi)
while (ain) {
ain_next = ain->next;
if (ain->peer == peer) {
if (ain->peer == peer)
bgp_adj_in_remove(dest, ain);
bgp_dest_unlock_node(dest);
}
ain = ain_next;
}