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 77087f38cff2ef50a329046b385aefe24db1bb6d..4298f715146be656ec65d7dca116b28d369bd306 100644 (file)
--- 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());
                        }