diff options
Diffstat (limited to 'cli/ops')
| -rw-r--r-- | cli/ops/net.rs | 16 | ||||
| -rw-r--r-- | cli/ops/net_unix.rs | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/cli/ops/net.rs b/cli/ops/net.rs index b46eedc68..123c61f35 100644 --- a/cli/ops/net.rs +++ b/cli/ops/net.rs @@ -224,7 +224,7 @@ fn op_send( transport, transport_args: ArgsEnum::Unix(args), } if transport == "unixpacket" => { - let address_path = net_unix::Path::new(&args.address); + let address_path = net_unix::Path::new(&args.path); state.check_read(&address_path)?; let op = async move { let mut resource_table = resource_table.borrow_mut(); @@ -301,12 +301,12 @@ fn op_connect( transport, transport_args: ArgsEnum::Unix(args), } if transport == "unix" => { - let address_path = net_unix::Path::new(&args.address); + let address_path = net_unix::Path::new(&args.path); state.check_read(&address_path)?; let op = async move { - let address = args.address; + let path = args.path; let unix_stream = - net_unix::UnixStream::connect(net_unix::Path::new(&address)).await?; + net_unix::UnixStream::connect(net_unix::Path::new(&path)).await?; let local_addr = unix_stream.local_addr()?; let remote_addr = unix_stream.peer_addr()?; let mut resource_table = resource_table.borrow_mut(); @@ -319,11 +319,11 @@ fn op_connect( Ok(json!({ "rid": rid, "localAddr": { - "address": local_addr.as_pathname(), + "path": local_addr.as_pathname(), "transport": transport, }, "remoteAddr": { - "address": remote_addr.as_pathname(), + "path": remote_addr.as_pathname(), "transport": transport, } })) @@ -521,7 +521,7 @@ fn op_listen( transport, transport_args: ArgsEnum::Unix(args), } if transport == "unix" || transport == "unixpacket" => { - let address_path = net_unix::Path::new(&args.address); + let address_path = net_unix::Path::new(&args.path); state.check_read(&address_path)?; state.check_write(&address_path)?; let (rid, local_addr) = if transport == "unix" { @@ -537,7 +537,7 @@ fn op_listen( Ok(JsonOp::Sync(json!({ "rid": rid, "localAddr": { - "address": local_addr.as_pathname(), + "path": local_addr.as_pathname(), "transport": transport, }, }))) diff --git a/cli/ops/net_unix.rs b/cli/ops/net_unix.rs index 28b895b2c..4b09c2fdb 100644 --- a/cli/ops/net_unix.rs +++ b/cli/ops/net_unix.rs @@ -23,7 +23,7 @@ pub struct UnixDatagramResource { #[derive(Deserialize)] pub struct UnixListenArgs { - pub address: String, + pub path: String, } pub fn accept_unix( @@ -64,11 +64,11 @@ pub fn accept_unix( Ok(json!({ "rid": rid, "localAddr": { - "address": local_addr.as_pathname(), + "path": local_addr.as_pathname(), "transport": "unix", }, "remoteAddr": { - "address": remote_addr.as_pathname(), + "path": remote_addr.as_pathname(), "transport": "unix", } })) @@ -96,7 +96,7 @@ pub fn receive_unix_packet( Ok(json!({ "size": size, "remoteAddr": { - "address": remote_addr.as_pathname(), + "path": remote_addr.as_pathname(), "transport": "unixpacket", } })) |