f - only forward to connected peers

Author: jkczyz

lightning/src/onion_message/messenger.rs

@@ -722,14 +722,16 @@ where
 					.or_insert_with(|| OnionMessageBuffer::ConnectedPeer(VecDeque::new()));
 
 				match message_buffers.entry(next_node_id) {
-					hash_map::Entry::Vacant(_) => {
-						log_trace!(self.logger, "Dropping forwarded onion message to disconnected peer {:?}", next_node_id);
-						return
-					},
-					hash_map::Entry::Occupied(mut e) => {
+					hash_map::Entry::Occupied(mut e) if matches!(
+						e.get(), OnionMessageBuffer::ConnectedPeer(..)
+					) => {
 						e.get_mut().enqueue_message(onion_message);
 						log_trace!(self.logger, "Forwarding an onion message to peer {}", next_node_id);
 					},
+					_ => {
+						log_trace!(self.logger, "Dropping forwarded onion message to disconnected peer {:?}", next_node_id);
+						return
+					},
 				}
 			},
 			Err(e) => {