proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 22:29:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6959 from patrasar/bgp_collision_issue

Browse Source 
bgpd: Fix BGP session stuck in OpenConfirm state
This commit is contained in:
Russ White 2020-08-25 07:15:34 -04:00 committed by GitHub
commit de4fa7efe5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bgpd/bgp_fsm.c
View File

@ -304,8 +304,8 @@ static struct peer *peer_xfer_conn(struct peer *from_peer)
? "accept" ? "accept"
: ""), : ""),
peer->host, peer->fd, from_peer->fd); peer->host, peer->fd, from_peer->fd);
bgp_stop(peer); BGP_EVENT_ADD(peer, BGP_Stop);
bgp_stop(from_peer); BGP_EVENT_ADD(from_peer, BGP_Stop);
return NULL; return NULL;
} }
if (from_peer->status > Active) { if (from_peer->status > Active) {
@ -1673,9 +1673,6 @@ static int bgp_fsm_open(struct peer *peer)
/* Send keepalive and make keepalive timer */ /* Send keepalive and make keepalive timer */
bgp_keepalive_send(peer); bgp_keepalive_send(peer);
/* Reset holdtimer value. */
BGP_TIMER_OFF(peer->t_holdtime);
return 0; return 0;
} }