From: Donatas Abraitis <donatas@opensourcerouting.org>
Date: Thu, 31 Aug 2023 14:33:57 +0000 (+0300)
Subject: Revert "bgpd: Add peers back to peer hash when peer_xfer_conn fails"
X-Git-Tag: base_9.1~109^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=bc81691247228ad14501b86afe63dff0daf96ab6;p=matthieu%2Ffrr.git

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.
---

diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index df137b8d54..b0d2a8fe0e 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -2146,17 +2146,6 @@ bgp_establish(struct peer_connection *connection)
 	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;
 	}