Fix the bug of an async runtime demanded by UdpSocket::from_std

eclipse-zenoh · Mar 11, 2024 · 40a4e48 · 40a4e48
1 parent 6a139b1
commit 40a4e48
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/zenoh/src/net/runtime/orchestrator.rs b/zenoh/src/net/runtime/orchestrator.rs
@@ -423,7 +423,11 @@ impl Runtime {
         // Must set to nonblocking according to the doc of tokio
         // https://docs.rs/tokio/latest/tokio/net/struct.UdpSocket.html#notes
         socket.set_nonblocking(true)?;
-        Ok(UdpSocket::from_std(socket.into())?)
+
+        // UdpSocket::from_std requires a runtime even though it's a sync function
+        let udp_socket = zenoh_runtime::ZRuntime::Net
+            .block_in_place(async { UdpSocket::from_std(socket.into()) })?;
+        Ok(udp_socket)
     }
 
     pub fn bind_ucast_port(addr: IpAddr) -> ZResult<UdpSocket> {
@@ -453,7 +457,11 @@ impl Runtime {
         // Must set to nonblocking according to the doc of tokio
         // https://docs.rs/tokio/latest/tokio/net/struct.UdpSocket.html#notes
         socket.set_nonblocking(true)?;
-        Ok(UdpSocket::from_std(socket.into())?)
+
+        // UdpSocket::from_std requires a runtime even though it's a sync function
+        let udp_socket = zenoh_runtime::ZRuntime::Net
+            .block_in_place(async { UdpSocket::from_std(socket.into()) })?;
+        Ok(udp_socket)
     }
 
     async fn spawn_peer_connector(&self, peer: EndPoint) -> ZResult<()> {