summaryrefslogtreecommitdiff
path: root/cli/ops
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2020-01-18 18:35:12 +0100
committerGitHub <noreply@github.com>2020-01-18 18:35:12 +0100
commit34b99fec8edcff7d3b667f273afea69df15e4d5e (patch)
tree108ea1800b83641023baede5bf9bceba8238f203 /cli/ops
parent4f1fa82d1d0458170039d4809c3879993659e560 (diff)
rename dial to connect and dialTLS to connectTLS (#3710)
Diffstat (limited to 'cli/ops')
-rw-r--r--cli/ops/net.rs8
-rw-r--r--cli/ops/tls.rs11
2 files changed, 11 insertions, 8 deletions
diff --git a/cli/ops/net.rs b/cli/ops/net.rs
index 06905f0d2..f337a28d8 100644
--- a/cli/ops/net.rs
+++ b/cli/ops/net.rs
@@ -22,7 +22,7 @@ use tokio::net::TcpStream;
pub fn init(i: &mut Isolate, s: &ThreadSafeState) {
i.register_op("accept", s.core_op(json_op(s.stateful_op(op_accept))));
- i.register_op("dial", s.core_op(json_op(s.stateful_op(op_dial))));
+ i.register_op("connect", s.core_op(json_op(s.stateful_op(op_connect))));
i.register_op("shutdown", s.core_op(json_op(s.stateful_op(op_shutdown))));
i.register_op("listen", s.core_op(json_op(s.stateful_op(op_listen))));
}
@@ -126,18 +126,18 @@ fn op_accept(
}
#[derive(Deserialize)]
-struct DialArgs {
+struct ConnectArgs {
transport: String,
hostname: String,
port: u16,
}
-fn op_dial(
+fn op_connect(
state: &ThreadSafeState,
args: Value,
_zero_copy: Option<PinnedBuf>,
) -> Result<JsonOp, ErrBox> {
- let args: DialArgs = serde_json::from_value(args)?;
+ let args: ConnectArgs = serde_json::from_value(args)?;
assert_eq!(args.transport, "tcp"); // TODO Support others.
let state_ = state.clone();
state.check_net(&args.hostname, args.port)?;
diff --git a/cli/ops/tls.rs b/cli/ops/tls.rs
index 4bbab3f4e..fc2dec0d1 100644
--- a/cli/ops/tls.rs
+++ b/cli/ops/tls.rs
@@ -36,7 +36,10 @@ use webpki::DNSNameRef;
use webpki_roots;
pub fn init(i: &mut Isolate, s: &ThreadSafeState) {
- i.register_op("dial_tls", s.core_op(json_op(s.stateful_op(op_dial_tls))));
+ i.register_op(
+ "connect_tls",
+ s.core_op(json_op(s.stateful_op(op_connect_tls))),
+ );
i.register_op(
"listen_tls",
s.core_op(json_op(s.stateful_op(op_listen_tls))),
@@ -49,18 +52,18 @@ pub fn init(i: &mut Isolate, s: &ThreadSafeState) {
#[derive(Deserialize)]
#[serde(rename_all = "camelCase")]
-struct DialTLSArgs {
+struct ConnectTLSArgs {
hostname: String,
port: u16,
cert_file: Option<String>,
}
-pub fn op_dial_tls(
+pub fn op_connect_tls(
state: &ThreadSafeState,
args: Value,
_zero_copy: Option<PinnedBuf>,
) -> Result<JsonOp, ErrBox> {
- let args: DialTLSArgs = serde_json::from_value(args)?;
+ let args: ConnectTLSArgs = serde_json::from_value(args)?;
let cert_file = args.cert_file.clone();
let state_ = state.clone();
state.check_net(&args.hostname, args.port)?;