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

Merge pull request #5957 from pguibert6WIND/two_bfd_fixes

Browse Source 
Two bfd fixes
This commit is contained in:
Donatas Abraitis 2020-03-11 11:17:32 +02:00 committed by GitHub
commit 03d15b1073
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bgpd/bgp_fsm.c
View File

@ -1128,6 +1128,10 @@ int bgp_stop(struct peer *peer)
peer->nsf_af_count = 0; peer->nsf_af_count = 0;
/* deregister peer */
if (peer->last_reset != PEER_DOWN_BFD_DOWN)
bgp_bfd_deregister_peer(peer);
if (peer_dynamic_neighbor(peer) if (peer_dynamic_neighbor(peer)
&& !(CHECK_FLAG(peer->flags, PEER_FLAG_DELETE))) { && !(CHECK_FLAG(peer->flags, PEER_FLAG_DELETE))) {
if (bgp_debug_neighbor_events(peer)) if (bgp_debug_neighbor_events(peer))
@ -1931,6 +1935,7 @@ static int bgp_establish(struct peer *peer)
hash_release(peer->bgp->peerhash, peer); hash_release(peer->bgp->peerhash, peer);
hash_get(peer->bgp->peerhash, peer, hash_alloc_intern); hash_get(peer->bgp->peerhash, peer, hash_alloc_intern);
bgp_bfd_deregister_peer(peer);
bgp_bfd_register_peer(peer); bgp_bfd_register_peer(peer);
return ret; return ret;
} }