diff options
Diffstat (limited to 'runtime/ops')
| -rw-r--r-- | runtime/ops/net.rs | 7 | ||||
| -rw-r--r-- | runtime/ops/tls.rs | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/runtime/ops/net.rs b/runtime/ops/net.rs index 98ff83fc0..8770ef103 100644 --- a/runtime/ops/net.rs +++ b/runtime/ops/net.rs @@ -4,6 +4,7 @@ use crate::ops::io::StreamResource; use crate::ops::io::StreamResourceHolder; use crate::permissions::Permissions; use crate::resolve_addr::resolve_addr; +use crate::resolve_addr::resolve_addr_sync; use deno_core::error::bad_resource; use deno_core::error::bad_resource_id; use deno_core::error::custom_error; @@ -205,7 +206,7 @@ async fn op_datagram_send( s.borrow::<Permissions>() .check_net(&args.hostname, args.port)?; } - let addr = resolve_addr(&args.hostname, args.port)?; + let addr = resolve_addr(&args.hostname, args.port).await?; poll_fn(move |cx| { let mut state = state.borrow_mut(); let resource = state @@ -272,7 +273,7 @@ async fn op_connect( .borrow::<Permissions>() .check_net(&args.hostname, args.port)?; } - let addr = resolve_addr(&args.hostname, args.port)?; + let addr = resolve_addr(&args.hostname, args.port).await?; let tcp_stream = TcpStream::connect(&addr).await?; let local_addr = tcp_stream.local_addr()?; let remote_addr = tcp_stream.peer_addr()?; @@ -505,7 +506,7 @@ fn op_listen( } permissions.check_net(&args.hostname, args.port)?; } - let addr = resolve_addr(&args.hostname, args.port)?; + let addr = resolve_addr_sync(&args.hostname, args.port)?; let (rid, local_addr) = if transport == "tcp" { listen_tcp(state, addr)? } else { diff --git a/runtime/ops/tls.rs b/runtime/ops/tls.rs index 37fd8f206..b59650ab0 100644 --- a/runtime/ops/tls.rs +++ b/runtime/ops/tls.rs @@ -3,6 +3,7 @@ use super::io::{StreamResource, StreamResourceHolder}; use crate::permissions::Permissions; use crate::resolve_addr::resolve_addr; +use crate::resolve_addr::resolve_addr_sync; use deno_core::error::bad_resource; use deno_core::error::bad_resource_id; use deno_core::error::custom_error; @@ -160,7 +161,7 @@ async fn op_connect_tls( domain.push_str("localhost"); } - let addr = resolve_addr(&args.hostname, args.port)?; + let addr = resolve_addr(&args.hostname, args.port).await?; let tcp_stream = TcpStream::connect(&addr).await?; let local_addr = tcp_stream.local_addr()?; let remote_addr = tcp_stream.peer_addr()?; @@ -334,7 +335,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 = resolve_addr(&args.hostname, args.port)?; + let addr = resolve_addr_sync(&args.hostname, args.port)?; let std_listener = std::net::TcpListener::bind(&addr)?; let listener = TcpListener::from_std(std_listener)?; let local_addr = listener.local_addr()?; |