fix(quic): ipv6 support

Author: thedevbirb

msg-common/src/lib.rs

@@ -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::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6},
+    time::SystemTime,
+};
 
 use futures::future::BoxFuture;
 
@@ -33,3 +36,33 @@ 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 bound to port 0 of the same protocol version of
+    /// the provided address.
+    fn unspecified_compatible_with(other: &Self) -> Self;
+}
+
+impl SocketAddrExt for SocketAddr {
+    fn unspecified_v4() -> Self {
+        SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 0))
+    }
+
+    fn unspecified_v6() -> Self {
+        SocketAddr::V6(SocketAddrV6::new(Ipv6Addr::UNSPECIFIED, 0, 0, 0))
+    }
+
+    fn unspecified_compatible_with(other: &Self) -> Self {
+        match other {
+            SocketAddr::V4(_) => Self::unspecified_v4(),
+            SocketAddr::V6(_) => Self::unspecified_v6(),
+        }
+    }
+}

msg-transport/src/quic/mod.rs

@@ -13,7 +13,7 @@ use tracing::{debug, error};
 
 use crate::{Acceptor, Transport, TransportExt};
 
-use msg_common::async_error;
+use msg_common::{SocketAddrExt, async_error};
 
 mod config;
 pub use config::{Config, ConfigBuilder};
@@ -65,10 +65,10 @@ impl Quic {
     /// `addr` is given, the endpoint will be bound to the default address.
     fn new_endpoint(
         &self,
-        addr: Option<SocketAddr>,
+        addr: SocketAddr,
         server_config: Option<quinn::ServerConfig>,
     ) -> Result<quinn::Endpoint, Error> {
-        let socket = UdpSocket::bind(addr.unwrap_or(SocketAddr::from(([0, 0, 0, 0], 0))))?;
+        let socket = UdpSocket::bind(addr)?;
 
         let endpoint = quinn::Endpoint::new(
             self.config.endpoint_config.clone(),
@@ -111,7 +111,8 @@ impl Transport<SocketAddr> for Quic {
         let endpoint = if let Some(endpoint) = self.endpoint.clone() {
             endpoint
         } else {
-            let Ok(endpoint) = self.new_endpoint(None, None) else {
+            let endpoint_addr = SocketAddr::unspecified_compatible_with(&addr);
+            let Ok(endpoint) = self.new_endpoint(endpoint_addr, None) else {
                 return async_error(Error::ClosedEndpoint);
             };