summaryrefslogtreecommitdiff
path: root/cli/ops/net.rs
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2020-04-16 05:14:28 +0200
committerGitHub <noreply@github.com>2020-04-15 23:14:28 -0400
commitaab26d226e32ac84da8c855388217b3ee781979d (patch)
tree118aef355e921f830ffbc6c6685f96138787b224 /cli/ops/net.rs
parentfab0204cbf20cc1be7874266325bf258fe0ecaca (diff)
remove calls to futures::executor::block_on (#4760)
Diffstat (limited to 'cli/ops/net.rs')
-rw-r--r--cli/ops/net.rs7
1 files changed, 3 insertions, 4 deletions
diff --git a/cli/ops/net.rs b/cli/ops/net.rs
index fd4227015..aa6d9929f 100644
--- a/cli/ops/net.rs
+++ b/cli/ops/net.rs
@@ -215,7 +215,7 @@ fn op_send(
OpError::bad_resource("Socket has been closed".to_string())
})?;
let socket = &mut resource.socket;
- let addr = resolve_addr(&args.hostname, args.port).await?;
+ let addr = resolve_addr(&args.hostname, args.port)?;
socket.send_to(&buf, addr).await?;
Ok(json!({}))
};
@@ -273,7 +273,7 @@ fn op_connect(
let state_ = state.clone();
state.check_net(&args.hostname, args.port)?;
let op = async move {
- let addr = resolve_addr(&args.hostname, args.port).await?;
+ let addr = resolve_addr(&args.hostname, args.port)?;
let tcp_stream = TcpStream::connect(&addr).await?;
let local_addr = tcp_stream.local_addr()?;
let remote_addr = tcp_stream.peer_addr()?;
@@ -500,8 +500,7 @@ fn op_listen(
transport_args: ArgsEnum::Ip(args),
} => {
state.check_net(&args.hostname, args.port)?;
- let addr =
- futures::executor::block_on(resolve_addr(&args.hostname, args.port))?;
+ let addr = resolve_addr(&args.hostname, args.port)?;
let (rid, local_addr) = if transport == "tcp" {
listen_tcp(state, addr)?
} else {