From: Matt Corallo <git@bluematt.me>
Date: Fri, 13 Oct 2023 19:55:24 +0000 (+0000)
Subject: Ensure handlers see a consistent set of peers on conn rejection
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=refs%2Fheads%2F2023-10-peer-race-send-discon-test;p=rust-lightning

Ensure handlers see a consistent set of peers on conn rejection

If a message handler decides to reject a connection, other handlers
should see the disconnection if they've already seen the
connection. We weren't previously doing that, and do it here.
---

diff --git a/lightning/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs
index 77087f38..4298f715 100644
--- a/lightning/src/ln/peer_handler.rs
+++ b/lightning/src/ln/peer_handler.rs
@@ -1561,10 +1561,13 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 			}
 			if let Err(()) = self.message_handler.onion_message_handler.peer_connected(&their_node_id, &msg, peer_lock.inbound_connection) {
 				log_debug!(self.logger, "Onion Message Handler decided we couldn't communicate with peer {}", log_pubkey!(their_node_id));
+				self.message_handler.chan_handler.peer_disconnected(&their_node_id);
 				return Err(PeerHandleError { }.into());
 			}
 			if let Err(()) = self.message_handler.custom_message_handler.peer_connected(&their_node_id, &msg, peer_lock.inbound_connection) {
 				log_debug!(self.logger, "Custom Message Handler decided we couldn't communicate with peer {}", log_pubkey!(their_node_id));
+				self.message_handler.onion_message_handler.peer_disconnected(&their_node_id);
+				self.message_handler.chan_handler.peer_disconnected(&their_node_id);
 				return Err(PeerHandleError { }.into());
 			}