summaryrefslogtreecommitdiff
path: root/cli/ops/tls.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/tls.rs
parentfab0204cbf20cc1be7874266325bf258fe0ecaca (diff)
remove calls to futures::executor::block_on (#4760)
Diffstat (limited to 'cli/ops/tls.rs')
-rw-r--r--cli/ops/tls.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/cli/ops/tls.rs b/cli/ops/tls.rs
index a27d473da..27d3b3b6e 100644
--- a/cli/ops/tls.rs
+++ b/cli/ops/tls.rs
@@ -61,7 +61,7 @@ pub fn op_connect_tls(
}
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()?;
@@ -237,8 +237,7 @@ fn op_listen_tls(
.set_single_cert(load_certs(&cert_file)?, load_keys(&key_file)?.remove(0))
.expect("invalid key or certificate");
let tls_acceptor = TlsAcceptor::from(Arc::new(config));
- let addr =
- futures::executor::block_on(resolve_addr(&args.hostname, args.port))?;
+ let addr = resolve_addr(&args.hostname, args.port)?;
let listener = futures::executor::block_on(TcpListener::bind(&addr))?;
let local_addr = listener.local_addr()?;
let tls_listener_resource = TlsListenerResource {