From 9af3d0a24f28dfeee298e9d821d7f4db2aa3b1fc Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Thu, 31 Aug 2023 17:33:57 +0300 Subject: [PATCH] Revert "bgpd: Add peers back to peer hash when peer_xfer_conn fails" peer is NULL, but we pass it to hash_get(). This reverts commit 6f8c927b03c454aa309b84cefccc4faa31e0c03f. (cherry picked from commit bc81691247228ad14501b86afe63dff0daf96ab6) --- bgpd/bgp_fsm.c | 11 ----------- 1 file changed, 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; } -- 2.39.5