Change overwrite behavior in transport logic instead of Endpoint

This reverts commit 5157987.

commons/zenoh-protocol/src/core/endpoint.rs

@@ -385,9 +385,8 @@ impl ConfigMut<'_> {
             self.0.address(),
             self.0.metadata(),
             parameters::from_iter(parameters::sort(parameters::join(
-                // Endpoint config overwrites incoming config
-                iter.map(|(k, v)| (k.borrow(), v.borrow())),
                 self.0.config().iter(),
+                iter.map(|(k, v)| (k.borrow(), v.borrow())),
             ))),
         )?;
 

io/zenoh-links/zenoh-link-tls/src/utils.rs

@@ -32,7 +32,7 @@ use secrecy::ExposeSecret;
 use webpki::anchor_from_trusted_cert;
 use zenoh_config::Config as ZenohConfig;
 use zenoh_link_commons::{
-    tcp::TcpSocketConfig, tls::WebPkiVerifierAnyServerName, ConfigurationInspector,
+    tcp::TcpSocketConfig, tls::WebPkiVerifierAnyServerName, ConfigurationInspector, BIND_INTERFACE,
     TCP_RX_BUFFER_SIZE, TCP_TX_BUFFER_SIZE,
 };
 use zenoh_protocol::core::{
@@ -178,7 +178,7 @@ pub(crate) struct TlsServerConfig<'a> {
 }
 
 impl<'a> TlsServerConfig<'a> {
-    pub async fn new(config: &Config<'a>) -> ZResult<Self> {
+    pub async fn new(config: &'a Config<'_>) -> ZResult<Self> {
         let tls_server_client_auth: bool = match config.get(TLS_ENABLE_MTLS) {
             Some(s) => s
                 .parse()
@@ -277,8 +277,11 @@ impl<'a> TlsServerConfig<'a> {
             server_config: sc,
             tls_handshake_timeout,
             tls_close_link_on_expiration,
-            // TODO: add interface binding
-            tcp_socket_config: TcpSocketConfig::new(tcp_tx_buffer_size, tcp_rx_buffer_size, None),
+            tcp_socket_config: TcpSocketConfig::new(
+                tcp_tx_buffer_size,
+                tcp_rx_buffer_size,
+                config.get(BIND_INTERFACE),
+            ),
         })
     }
 
@@ -310,7 +313,7 @@ pub(crate) struct TlsClientConfig<'a> {
 }
 
 impl<'a> TlsClientConfig<'a> {
-    pub async fn new(config: &Config<'a>) -> ZResult<Self> {
+    pub async fn new(config: &'a Config<'_>) -> ZResult<Self> {
         let tls_client_server_auth: bool = match config.get(TLS_ENABLE_MTLS) {
             Some(s) => s
                 .parse()
@@ -440,8 +443,11 @@ impl<'a> TlsClientConfig<'a> {
         Ok(TlsClientConfig {
             client_config: cc,
             tls_close_link_on_expiration,
-            // TODO: add interface binding
-            tcp_socket_config: TcpSocketConfig::new(tcp_tx_buffer_size, tcp_rx_buffer_size, None),
+            tcp_socket_config: TcpSocketConfig::new(
+                tcp_tx_buffer_size,
+                tcp_rx_buffer_size,
+                config.get(BIND_INTERFACE),
+            ),
         })
     }
 

io/zenoh-transport/src/multicast/manager.rs

@@ -256,9 +256,15 @@ impl TransportManager {
             .await?;
         // Fill and merge the endpoint configuration
         if let Some(config) = self.config.endpoints.get(endpoint.protocol().as_str()) {
-            endpoint
-                .config_mut()
-                .extend_from_iter(parameters::iter(config))?;
+            let mut config = parameters::Parameters::from(config.as_str());
+            // Overwrite config with current endpoint parameters
+            config.extend_from_iter(endpoint.config().iter());
+            endpoint = EndPoint::new(
+                endpoint.protocol(),
+                endpoint.address(),
+                endpoint.metadata(),
+                config.as_str(),
+            )?;
         }
 
         // Open the link

io/zenoh-transport/src/unicast/manager.rs

@@ -385,9 +385,15 @@ impl TransportManager {
             .await?;
         // Fill and merge the endpoint configuration
         if let Some(config) = self.config.endpoints.get(endpoint.protocol().as_str()) {
-            endpoint
-                .config_mut()
-                .extend_from_iter(parameters::iter(config))?;
+            let mut config = parameters::Parameters::from(config.as_str());
+            // Overwrite config with current endpoint parameters
+            config.extend_from_iter(endpoint.config().iter());
+            endpoint = EndPoint::new(
+                endpoint.protocol(),
+                endpoint.address(),
+                endpoint.metadata(),
+                config.as_str(),
+            )?;
         };
         manager.new_listener(endpoint).await
     }
@@ -705,9 +711,15 @@ impl TransportManager {
             .await?;
         // Fill and merge the endpoint configuration
         if let Some(config) = self.config.endpoints.get(endpoint.protocol().as_str()) {
-            endpoint
-                .config_mut()
-                .extend_from_iter(parameters::iter(config))?;
+            let mut config = parameters::Parameters::from(config.as_str());
+            // Overwrite config with current endpoint parameters
+            config.extend_from_iter(endpoint.config().iter());
+            endpoint = EndPoint::new(
+                endpoint.protocol(),
+                endpoint.address(),
+                endpoint.metadata(),
+                config.as_str(),
+            )?;
         };
 
         // Create a new link associated by calling the Link Manager