summaryrefslogtreecommitdiff
path: root/cli/ops/net.rs
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2020-04-17 18:45:34 +0200
committerGitHub <noreply@github.com>2020-04-17 18:45:34 +0200
commit41f836dc915cfc0902fa911be06c3a62bef68222 (patch)
tree8e9f9b0cc83cc97bfd34cc44eaf42ea7e5026541 /cli/ops/net.rs
parent260084ccbf053485d00d5b6ebc804252c409be49 (diff)
replace block_on in net interfaces (#4796)
Diffstat (limited to 'cli/ops/net.rs')
-rw-r--r--cli/ops/net.rs6
1 files changed, 4 insertions, 2 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