diff options
| author | Russ White <russ@riw.us> | 2020-08-25 07:15:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-25 07:15:34 -0400 |
| commit | de4fa7efe52e3bc270b01bf095a261b4023fe1e3 (patch) | |
| tree | a75833c28cadbf083aa226a0c6eeaca8471a2c41 | |
| parent | 4a615020285f6aceb996c5049bea1f1abb4af71e (diff) | |
| parent | 6c4d8732e975cf67a815fc97430166bb4d7008aa (diff) | |
Merge pull request #6959 from patrasar/bgp_collision_issue
bgpd: Fix BGP session stuck in OpenConfirm state
| -rw-r--r-- | bgpd/bgp_fsm.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c index ab3b88da7a..c8e5a308ef 100644 --- a/bgpd/bgp_fsm.c +++ b/bgpd/bgp_fsm.c @@ -304,8 +304,8 @@ static struct peer *peer_xfer_conn(struct peer *from_peer) ? "accept" : ""), peer->host, peer->fd, from_peer->fd); - bgp_stop(peer); - bgp_stop(from_peer); + BGP_EVENT_ADD(peer, BGP_Stop); + BGP_EVENT_ADD(from_peer, BGP_Stop); return NULL; } if (from_peer->status > Active) { @@ -1673,9 +1673,6 @@ static int bgp_fsm_open(struct peer *peer) /* Send keepalive and make keepalive timer */ bgp_keepalive_send(peer); - /* Reset holdtimer value. */ - BGP_TIMER_OFF(peer->t_holdtime); - return 0; } |