diff options
Diffstat (limited to 'cli')
-rw-r--r-- | cli/ops/net.rs | 6 | ||||
-rw-r--r-- | cli/ops/tls.rs | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/cli/ops/net.rs b/cli/ops/net.rs index aa6d9929f..2636a2c2d 100644 --- a/cli/ops/net.rs +++ b/cli/ops/net.rs @@ -460,7 +460,8 @@ fn listen_tcp( addr: SocketAddr, ) -> Result<(u32, SocketAddr), OpError> { let mut state = state.borrow_mut(); - let listener = futures::executor::block_on(TcpListener::bind(&addr))?; + let std_listener = std::net::TcpListener::bind(&addr)?; + let listener = TcpListener::from_std(std_listener)?; let local_addr = listener.local_addr()?; let listener_resource = TcpListenerResource { listener, @@ -479,7 +480,8 @@ fn listen_udp( addr: SocketAddr, ) -> Result<(u32, SocketAddr), OpError> { let mut state = state.borrow_mut(); - let socket = futures::executor::block_on(UdpSocket::bind(&addr))?; + let std_socket = std::net::UdpSocket::bind(&addr)?; + let socket = UdpSocket::from_std(std_socket)?; let local_addr = socket.local_addr()?; let socket_resource = UdpSocketResource { socket }; let rid = state diff --git a/cli/ops/tls.rs b/cli/ops/tls.rs index 27d3b3b6e..60338f7fc 100644 --- a/cli/ops/tls.rs +++ b/cli/ops/tls.rs @@ -238,7 +238,8 @@ fn op_listen_tls( .expect("invalid key or certificate"); let tls_acceptor = TlsAcceptor::from(Arc::new(config)); let addr = resolve_addr(&args.hostname, args.port)?; - let listener = futures::executor::block_on(TcpListener::bind(&addr))?; + let std_listener = std::net::TcpListener::bind(&addr)?; + let listener = TcpListener::from_std(std_listener)?; let local_addr = listener.local_addr()?; let tls_listener_resource = TlsListenerResource { listener, |