diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2023-08-31 11:05:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-31 11:05:30 -0400 |
| commit | ebc2054b3b7c46e89834b996907858c7cfbdbdd1 (patch) | |
| tree | c7281ed223ecc421a341062d3d912eb8a2696f5b | |
| parent | 9d1ee3ade337cc195deaea76bda5b3e297df0c04 (diff) | |
| parent | 9af3d0a24f28dfeee298e9d821d7f4db2aa3b1fc (diff) | |
Merge pull request #14324 from FRRouting/mergify/bp/stable/9.0/pr-14322
Revert "bgpd: Add peers back to peer hash when peer_xfer_conn fails" (backport #14322)
| -rw-r--r-- | bgpd/bgp_fsm.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c index 00aefafb3d..09b35bc7e7 100644 --- a/bgpd/bgp_fsm.c +++ b/bgpd/bgp_fsm.c @@ -2116,17 +2116,6 @@ static enum bgp_fsm_state_progress bgp_establish(struct peer *peer) peer = peer_xfer_conn(peer); if (!peer) { flog_err(EC_BGP_CONNECT, "%%Neighbor failed in xfer_conn"); - - /* - * A failure of peer_xfer_conn but not putting the peers - * back in the hash ends up with a situation where incoming - * connections are rejected, as that the peer is not found - * when a lookup is done - */ - (void)hash_get(peer->bgp->peerhash, peer, hash_alloc_intern); - if (other) - (void)hash_get(other->bgp->peerhash, other, - hash_alloc_intern); return BGP_FSM_FAILURE; } |