Turn the socket interface binding to be optional

eclipse-zenoh · Mar 20, 2024 · 093091b · 093091b
1 parent 0a3b7a9
commit 093091b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/commons/zenoh-util/src/std_only/net/mod.rs b/commons/zenoh-util/src/std_only/net/mod.rs
@@ -424,29 +424,25 @@ pub fn get_ipv6_ipaddrs(interface: Option<&str>) -> Vec<IpAddr> {
 }
 
 #[cfg(any(target_os = "linux", target_os = "android"))]
-pub fn set_bind_to_device_tcp_socket(socket: &TcpSocket, iface: Option<&str>) -> ZResult<()> {
-    if let Some(iface) = iface {
-        socket.bind_device(Some(iface.as_bytes()))?;
-    }
+pub fn set_bind_to_device_tcp_socket(socket: &TcpSocket, iface: &str) -> ZResult<()> {
+    socket.bind_device(Some(iface.as_bytes()))?;
     Ok(())
 }
 
 #[cfg(any(target_os = "linux", target_os = "android"))]
-pub fn set_bind_to_device_udp_socket(socket: &UdpSocket, iface: Option<&str>) -> ZResult<()> {
-    if let Some(iface) = iface {
-        socket.bind_device(Some(iface.as_bytes()))?;
-    }
+pub fn set_bind_to_device_udp_socket(socket: &UdpSocket, iface: &str) -> ZResult<()> {
+    socket.bind_device(Some(iface.as_bytes()))?;
     Ok(())
 }
 
 #[cfg(any(target_os = "macos", target_os = "windows"))]
-pub fn set_bind_to_device_tcp_socket(socket: &TcpSocket, iface: Option<&str>) -> ZResult<()> {
-    log::warn!("Binding the socket {socket:?} to the interface {iface:?} is not supported on macOS and Windows");
+pub fn set_bind_to_device_tcp_socket(socket: &TcpSocket, iface: &str) -> ZResult<()> {
+    log::warn!("Binding the socket {socket:?} to the interface {iface} is not supported on macOS and Windows");
     Ok(())
 }
 
 #[cfg(any(target_os = "macos", target_os = "windows"))]
-pub fn set_bind_to_device_udp_socket(socket: &UdpSocket, iface: Option<&str>) -> ZResult<()> {
-    log::warn!("Binding the socket {socket:?} to the interface {iface:?} is not supported on macOS and Windows");
+pub fn set_bind_to_device_udp_socket(socket: &UdpSocket, iface: &str) -> ZResult<()> {
+    log::warn!("Binding the socket {socket:?} to the interface {iface} is not supported on macOS and Windows");
     Ok(())
 }
diff --git a/io/zenoh-links/zenoh-link-tcp/src/unicast.rs b/io/zenoh-links/zenoh-link-tcp/src/unicast.rs
@@ -218,7 +218,9 @@ impl LinkManagerUnicastTcp {
             SocketAddr::V6(_) => TcpSocket::new_v6(),
         }?;
 
-        zenoh_util::net::set_bind_to_device_tcp_socket(&socket, iface)?;
+        if let Some(iface) = iface {
+            zenoh_util::net::set_bind_to_device_tcp_socket(&socket, iface)?;
+        }
 
         // Build a TcpStream from TcpSocket
         // https://docs.rs/tokio/latest/tokio/net/struct.TcpSocket.html
@@ -248,7 +250,9 @@ impl LinkManagerUnicastTcp {
             SocketAddr::V6(_) => TcpSocket::new_v6(),
         }?;
 
-        zenoh_util::net::set_bind_to_device_tcp_socket(&socket, iface)?;
+        if let Some(iface) = iface {
+            zenoh_util::net::set_bind_to_device_tcp_socket(&socket, iface)?;
+        }
 
         // Build a TcpListener from TcpSocket
         // https://docs.rs/tokio/latest/tokio/net/struct.TcpSocket.html

diff --git a/io/zenoh-links/zenoh-link-udp/src/unicast.rs b/io/zenoh-links/zenoh-link-udp/src/unicast.rs
@@ -277,7 +277,9 @@ impl LinkManagerUnicastUdp {
             e
         })?;
 
-        zenoh_util::net::set_bind_to_device_udp_socket(&socket, iface)?;
+        if let Some(iface) = iface {
+            zenoh_util::net::set_bind_to_device_udp_socket(&socket, iface)?;
+        }
 
         // Connect the socket to the remote address
         socket.connect(dst_addr).await.map_err(|e| {
@@ -314,7 +316,9 @@ impl LinkManagerUnicastUdp {
             e
         })?;
 
-        zenoh_util::net::set_bind_to_device_udp_socket(&socket, iface)?;
+        if let Some(iface) = iface {
+            zenoh_util::net::set_bind_to_device_udp_socket(&socket, iface)?;
+        }
 
         let local_addr = socket.local_addr().map_err(|e| {
             let e = zerror!("Can not create a new UDP listener on {}: {}", addr, e);