feat: merge with TcpTls

Author: mempirate

Cargo.lock

@@ -45,8 +45,9 @@ msg-sim = { path = "./msg-sim" }
 async-trait = "0.1"
 tokio = { version = "1", features = ["full"] }
 tokio-util = { version = "0.7", features = ["codec"] }
-futures = "0.3"
 tokio-stream = { version = "0.1", features = ["sync"] }
+tokio-openssl = { version = "0.6" }
+futures = "0.3"
 parking_lot = "0.12"
 
 # general
@@ -56,10 +57,19 @@ tracing = "0.1"
 rustc-hash = "1"
 rand = "0.8"
 libc = "0.2"
+derive_more = { version = "2.0.1", features = [
+    "from",
+    "into",
+    "deref",
+    "deref_mut",
+] }
 
 # networking
 quinn = "0.11.9"
 rcgen = "0.14"
+# (rustls needs to be the same version as the one used by quinn)
+rustls = { version = "0.21", features = ["quic", "dangerous_configuration"] }
+openssl = { version = "0.10" }
 
 # benchmarking & profiling
 criterion = { version = "0.5", features = ["async_tokio"] }

Cargo.toml

@@ -4,7 +4,10 @@
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 #![cfg_attr(not(test), warn(unused_crate_dependencies))]
 
-use std::time::SystemTime;
+use std::{
+    net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6},
+    time::SystemTime,
+};
 
 use futures::future::BoxFuture;
 
@@ -33,3 +36,47 @@ pub mod constants {
     pub const MiB: u32 = 1024 * KiB;
     pub const GiB: u32 = 1024 * MiB;
 }
+
+/// Extension trait for `SocketAddr`.
+pub trait SocketAddrExt: Sized {
+    /// Returns the unspecified IPv4 socket address, bound to port 0.
+    fn unspecified_v4() -> Self;
+
+    /// Returns the unspecified IPv6 socket address, bound to port 0.
+    fn unspecified_v6() -> Self;
+
+    /// Returns the unspecified socket address of the same family as `other`, bound to port 0.
+    fn as_unspecified(&self) -> Self;
+}
+
+impl SocketAddrExt for SocketAddr {
+    fn unspecified_v4() -> Self {
+        Self::V4(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 0))
+    }
+
+    fn unspecified_v6() -> Self {
+        Self::V6(SocketAddrV6::new(Ipv6Addr::UNSPECIFIED, 0, 0, 0))
+    }
+
+    fn as_unspecified(&self) -> Self {
+        match self {
+            Self::V4(_) => Self::unspecified_v4(),
+            Self::V6(_) => Self::unspecified_v6(),
+        }
+    }
+}
+
+/// Extension trait for IP addresses.
+pub trait IpAddrExt: Sized {
+    /// Returns the localhost address of the same family as `other`.
+    fn as_localhost(&self) -> Self;
+}
+
+impl IpAddrExt for IpAddr {
+    fn as_localhost(&self) -> Self {
+        match self {
+            Self::V4(_) => Self::V4(Ipv4Addr::LOCALHOST),
+            Self::V6(_) => Self::V6(Ipv6Addr::LOCALHOST),
+        }
+    }
+}

msg-common/src/lib.rs

@@ -28,7 +28,8 @@ parking_lot.workspace = true
 
 [dev-dependencies]
 rand.workspace = true
-msg-transport = { workspace = true, features = ["quic"] }
+msg-transport = { workspace = true, features = ["quic", "tcp-tls"] }
+openssl.workspace = true
 
 msg-sim.workspace = true
 

msg-socket/Cargo.toml

@@ -1,6 +1,6 @@
 use std::{
     collections::HashSet,
-    net::{IpAddr, Ipv4Addr, SocketAddr},
+    net::SocketAddr,
     path::PathBuf,
     pin::Pin,
     sync::Arc,
@@ -14,7 +14,7 @@ use tokio::{
     sync::mpsc,
 };
 
-use msg_common::JoinMap;
+use msg_common::{IpAddrExt, JoinMap};
 use msg_transport::{Address, Transport};
 
 // ADDED: Import the specific SubStats struct for the API
@@ -61,8 +61,7 @@ where
         // Some transport implementations (e.g. Quinn) can't dial an unspecified
         // IP address, so replace it with localhost.
         if endpoint.ip().is_unspecified() {
-            // TODO: support IPv6
-            endpoint.set_ip(IpAddr::V4(Ipv4Addr::LOCALHOST));
+            endpoint.set_ip(endpoint.ip().as_localhost());
         }
 
         self.connect_inner(endpoint).await
@@ -76,8 +75,7 @@ where
         // Some transport implementations (e.g. Quinn) can't dial an unspecified
         // IP address, so replace it with localhost.
         if endpoint.ip().is_unspecified() {
-            // TODO: support IPv6
-            endpoint.set_ip(IpAddr::V4(Ipv4Addr::LOCALHOST));
+            endpoint.set_ip(endpoint.ip().as_localhost());
         }
 
         self.try_connect_inner(endpoint)