Split routing from getting network messages

[rust-lightning] / lightning / src / ln / peer_handler.rs

diff --git a/lightning/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs
index 02bb2625b1519269aad4a8333ddd466ff75e2948..de0d50c7f8e4daa0298ed15bbb4c26f39a164ead 100644 (file)
--- a/lightning/src/ln/peer_handler.rs
+++ b/lightning/src/ln/peer_handler.rs
@@ -36,7 +36,7 @@ pub struct MessageHandler<CM: Deref> where CM::Target: msgs::ChannelMessageHandl
        /// ChannelManager object.
        pub chan_handler: CM,
        /// A message handler which handles messages updating our knowledge of the network channel
-       /// graph. Usually this is just a Router object.
+       /// graph. Usually this is just a NetGraphMsgHandlerMonitor object.
        pub route_handler: Arc<msgs::RoutingMessageHandler>,
 }
 
@@ -641,6 +641,10 @@ impl<Descriptor: SocketDescriptor, CM: Deref> PeerManager<Descriptor, CM> where
                                                                                                        peer.sync_status = InitSyncTracker::ChannelsSyncing(0);
                                                                                                        peers.peers_needing_send.insert(peer_descriptor.clone());
                                                                                                }
+                                                                                               if !msg.features.supports_static_remote_key() {
+                                                                                                       log_debug!(self, "Peer {} does not support static remote key, disconnecting with no_connection_possible", log_pubkey!(peer.their_node_id.unwrap()));
+                                                                                                       return Err(PeerHandleError{ no_connection_possible: true });
+                                                                                               }
 
                                                                                                if !peer.outbound {
                                                                                                        let mut features = InitFeatures::known();