impl From<SocketAddr> for NetAddress

Author: MaxFangX

lightning-net-tokio/src/lib.rs

@@ -81,7 +81,7 @@ use tokio::io::{AsyncReadExt, AsyncWrite, AsyncWriteExt};
 use lightning::ln::peer_handler;
 use lightning::ln::peer_handler::SocketDescriptor as LnSocketTrait;
 use lightning::ln::peer_handler::CustomMessageHandler;
-use lightning::ln::msgs::{ChannelMessageHandler, RoutingMessageHandler, NetAddress};
+use lightning::ln::msgs::{ChannelMessageHandler, RoutingMessageHandler};
 use lightning::util::logger::Logger;
 
 use std::task;
@@ -211,20 +211,6 @@ impl Connection {
 	}
 }
 
-fn get_addr_from_stream(stream: &StdTcpStream) -> Option<NetAddress> {
-	match stream.peer_addr() {
-		Ok(SocketAddr::V4(sockaddr)) => Some(NetAddress::IPv4 {
-			addr: sockaddr.ip().octets(),
-			port: sockaddr.port(),
-		}),
-		Ok(SocketAddr::V6(sockaddr)) => Some(NetAddress::IPv6 {
-			addr: sockaddr.ip().octets(),
-			port: sockaddr.port(),
-		}),
-		Err(_) => None,
-	}
-}
-
 /// Process incoming messages and feed outgoing messages on the provided socket generated by
 /// accepting an incoming connection.
 ///
@@ -236,7 +222,7 @@ pub fn setup_inbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerManag
 		RMH: RoutingMessageHandler + 'static + Send + Sync,
 		L: Logger + 'static + ?Sized + Send + Sync,
 		UMH: CustomMessageHandler + 'static + Send + Sync {
-	let remote_addr = get_addr_from_stream(&stream);
+    let remote_addr = stream.peer_addr().ok().map(|sock_addr| sock_addr.into());
 	let (reader, write_receiver, read_receiver, us) = Connection::new(stream);
 	#[cfg(debug_assertions)]
 	let last_us = Arc::clone(&us);
@@ -278,7 +264,7 @@ pub fn setup_outbound<CMH, RMH, L, UMH>(peer_manager: Arc<peer_handler::PeerMana
 		RMH: RoutingMessageHandler + 'static + Send + Sync,
 		L: Logger + 'static + ?Sized + Send + Sync,
 		UMH: CustomMessageHandler + 'static + Send + Sync {
-	let remote_addr = get_addr_from_stream(&stream);
+    let remote_addr = stream.peer_addr().ok().map(|sock_addr| sock_addr.into());
 	let (reader, mut write_receiver, read_receiver, us) = Connection::new(stream);
 	#[cfg(debug_assertions)]
 	let last_us = Arc::clone(&us);

lightning-net/src/lib.rs

@@ -46,15 +46,15 @@
 
 use core::hash;
 use std::io::{Read, Write};
-use std::net::{IpAddr, Shutdown, SocketAddr, TcpStream};
+use std::net::{Shutdown, SocketAddr, TcpStream};
 use std::sync::atomic::{AtomicU64, Ordering};
 use std::sync::Arc;
 use std::thread::{self, JoinHandle};
 
 use crossbeam_channel::{select, Receiver, Sender, TryRecvError, TrySendError};
 
 use bitcoin::secp256k1::PublicKey;
-use lightning::ln::msgs::{ChannelMessageHandler, NetAddress, RoutingMessageHandler};
+use lightning::ln::msgs::{ChannelMessageHandler, RoutingMessageHandler};
 use lightning::ln::peer_handler::{
     CustomMessageHandler, PeerHandleError, PeerManager, SocketDescriptor,
 };
@@ -132,7 +132,7 @@ where
 
     // Generate a new ID that represents this connection
     let conn_id = next_connection_id();
-    let socket_addr = stream.peer_addr().unwrap();
+    let remote_addr = stream.peer_addr().ok().map(|sock_addr| sock_addr.into());
 
     // Init TcpReader, TcpWriter, TcpDisconnectooor
     let writer_stream = stream.try_clone().unwrap();
@@ -174,10 +174,10 @@ where
     // In all cases, return the result of the call into the PeerManager.
     match conn_type {
         ConnectionType::Inbound => {
-            peer_manager.new_inbound_connection(descriptor.clone(), Some(to_net(socket_addr)))
+            peer_manager.new_inbound_connection(descriptor.clone(), remote_addr)
         }
         ConnectionType::Outbound(their_node_id) => peer_manager
-            .new_outbound_connection(their_node_id, descriptor.clone(), Some(to_net(socket_addr)))
+            .new_outbound_connection(their_node_id, descriptor.clone(), remote_addr)
             .map(|initial_data| {
                 // PeerManager accepted the outbound connection; queue up the
                 // initial WriteData WriterCommand.
@@ -209,21 +209,6 @@ where
     })
 }
 
-// NOTE: It would be nice to have a `impl From<SocketAddr> for NetAddress` in
-//       the `lightning` crate
-fn to_net(socket_addr: SocketAddr) -> NetAddress {
-    match socket_addr.ip() {
-        IpAddr::V4(ip) => NetAddress::IPv4 {
-            addr: ip.octets(),
-            port: socket_addr.port(),
-        },
-        IpAddr::V6(ip) => NetAddress::IPv6 {
-            addr: ip.octets(),
-            port: socket_addr.port(),
-        },
-    }
-}
-
 /// Commands that can be sent to the Reader.
 enum ReaderCommand {
     ResumeRead,

lightning/src/ln/msgs.rs

@@ -469,6 +469,22 @@ impl NetAddress {
 	pub(crate) const MAX_LEN: u16 = 37;
 }
 
+#[cfg(not(feature = "no-std"))]
+impl From<std::net::SocketAddr> for NetAddress {
+    fn from(socket_addr: std::net::SocketAddr) -> NetAddress {
+        match socket_addr.ip() {
+            std::net::IpAddr::V4(ip) => NetAddress::IPv4 {
+                addr: ip.octets(),
+                port: socket_addr.port(),
+            },
+            std::net::IpAddr::V6(ip) => NetAddress::IPv6 {
+                addr: ip.octets(),
+                port: socket_addr.port(),
+            },
+        }
+    }
+}
+
 impl Writeable for NetAddress {
 	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
 		match self {