Support QUIC port propagation

eclipse-zenoh · Jan 13, 2025 · 53d78c7 · 53d78c7
1 parent 5bb64b4
commit 53d78c7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/io/zenoh-links/zenoh-link-quic/src/unicast.rs b/io/zenoh-links/zenoh-link-quic/src/unicast.rs
@@ -42,7 +42,7 @@ use zenoh_protocol::{
 use zenoh_result::{bail, zerror, ZResult};
 
 use crate::{
-    utils::{get_quic_addr, TlsClientConfig, TlsServerConfig},
+    utils::{get_quic_addr, get_quic_host, TlsClientConfig, TlsServerConfig},
     ALPN_QUIC_HTTP, QUIC_ACCEPT_THROTTLE_TIME, QUIC_DEFAULT_MTU, QUIC_LOCATOR_PREFIX,
 };
 
@@ -251,11 +251,7 @@ impl LinkManagerUnicastQuic {
 impl LinkManagerUnicastTrait for LinkManagerUnicastQuic {
     async fn new_link(&self, endpoint: EndPoint) -> ZResult<LinkUnicast> {
         let epaddr = endpoint.address();
-        let host = epaddr
-            .as_str()
-            .split(':')
-            .next()
-            .ok_or("Endpoints must be of the form quic/<address>:<port>")?;
+        let host = get_quic_host(&epaddr)?;
         let epconf = endpoint.config();
 
         let dst_addr = get_quic_addr(&epaddr).await?;
@@ -358,6 +354,7 @@ impl LinkManagerUnicastTrait for LinkManagerUnicastQuic {
         };
 
         let addr = get_quic_addr(&epaddr).await?;
+        let host = get_quic_host(&epaddr)?;
 
         // Server config
         let mut server_crypto = TlsServerConfig::new(&epconf)
@@ -418,12 +415,18 @@ impl LinkManagerUnicastTrait for LinkManagerUnicastQuic {
         let local_addr = quic_endpoint
             .local_addr()
             .map_err(|e| zerror!("Can not create a new QUIC listener on {}: {}", addr, e))?;
+        let local_port = local_addr.port();
 
         // Update the endpoint locator address
-        let endpoint = EndPoint::new(
+        let locator = Locator::new(
             endpoint.protocol(),
-            local_addr.to_string(),
+            format!("{host}:{local_port}"),
             endpoint.metadata(),
+        )?;
+        let endpoint = EndPoint::new(
+            locator.protocol(),
+            locator.address(),
+            locator.metadata(),
             endpoint.config(),
         )?;
 
@@ -446,8 +449,6 @@ impl LinkManagerUnicastTrait for LinkManagerUnicastQuic {
         };
 
         // Initialize the QuicAcceptor
-        let locator = endpoint.to_locator();
-
         self.listeners
             .add_listener(endpoint, local_addr, task, token)
             .await?;

diff --git a/io/zenoh-links/zenoh-link-quic/src/utils.rs b/io/zenoh-links/zenoh-link-quic/src/utils.rs
@@ -506,6 +506,14 @@ pub async fn get_quic_addr(address: &Address<'_>) -> ZResult<SocketAddr> {
     }
 }
 
+pub fn get_quic_host<'a>(address: &'a Address<'a>) -> ZResult<&'a str> {
+    address
+        .as_str()
+        .split(':')
+        .next()
+        .ok_or_else(|| zerror!("Invalid QUIC address").into())
+}
+
 pub fn base64_decode(data: &str) -> ZResult<Vec<u8>> {
     use base64::{engine::general_purpose, Engine};
     Ok(general_purpose::STANDARD

diff --git a/io/zenoh-links/zenoh-link-tls/src/unicast.rs b/io/zenoh-links/zenoh-link-tls/src/unicast.rs
@@ -496,7 +496,7 @@ async fn accept_task(
                             match get_cert_chain_expiration(&tls_conn.peer_certificates())? {
                                 exp @ Some(_) => maybe_expiration_time = exp,
                                 None => tracing::warn!(
-                                    "Cannot monitor expiration for TLS link {:?} => {:?} : client does not have certificates",
+                                    "Cannot monitor expiration for TLS link {:?} => {:?}: client does not have certificates",
                                     src_addr,
                                     dst_addr,
                                 ),
@@ -607,6 +607,7 @@ fn get_cert_chain_expiration(
     Ok(link_expiration)
 }
 
+#[derive(Debug)]
 struct TlsAuthId {
     auth_value: Option<String>,
 }