diff options
author | Kermit Xuan <kermitlx@outlook.com> | 2020-06-13 22:14:31 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-13 10:14:31 -0400 |
commit | 77545219a6d5c9d474032ea5e8ccfcd69897d76b (patch) | |
tree | 17c9a2b1486507066952423e375ad3bc2600b004 /cli/ops/net.rs | |
parent | f6fa65938437385a4ec00ec090f797381f6638b7 (diff) |
fix: DatagramConn.send should return bytes sent (#6265)
Diffstat (limited to 'cli/ops/net.rs')
-rw-r--r-- | cli/ops/net.rs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cli/ops/net.rs b/cli/ops/net.rs index 2e627ddb9..57dcecab7 100644 --- a/cli/ops/net.rs +++ b/cli/ops/net.rs @@ -27,8 +27,11 @@ pub fn init(i: &mut CoreIsolate, s: &State) { i.register_op("op_connect", s.stateful_json_op2(op_connect)); i.register_op("op_shutdown", s.stateful_json_op2(op_shutdown)); i.register_op("op_listen", s.stateful_json_op2(op_listen)); - i.register_op("op_receive", s.stateful_json_op2(op_receive)); - i.register_op("op_send", s.stateful_json_op2(op_send)); + i.register_op( + "op_datagram_receive", + s.stateful_json_op2(op_datagram_receive), + ); + i.register_op("op_datagram_send", s.stateful_json_op2(op_datagram_send)); } #[derive(Deserialize)] @@ -161,8 +164,7 @@ fn receive_udp( Ok(JsonOp::Async(op.boxed_local())) } -// TODO(ry) Rename to op_datagram_receive -fn op_receive( +fn op_datagram_receive( isolate_state: &mut CoreIsolateState, state: &State, args: Value, @@ -192,8 +194,7 @@ struct SendArgs { transport_args: ArgsEnum, } -// TODO(ry) Rename to op_datagram_send -fn op_send( +fn op_datagram_send( isolate_state: &mut CoreIsolateState, state: &State, args: Value, @@ -222,7 +223,7 @@ fn op_send( .socket .poll_send_to(cx, &zero_copy, &addr) .map_err(OpError::from) - .map_ok(|_| json!({})) + .map_ok(|byte_length| json!(byte_length)) }); Ok(JsonOp::Async(f.boxed_local())) } |