From 71d41d9e9f020c9eb527a47e16e4041dfcdaef84 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sat, 13 Jun 2020 20:51:00 +0200 Subject: [PATCH 01/11] add TcpListener support for HermitCore Add basic support of TcpListerner for HermitCore. In addition, revise TcpStream to support peer_addr. --- src/libstd/sys/hermit/net.rs | 155 +++++++++++++++++++++++++---------- 1 file changed, 110 insertions(+), 45 deletions(-) diff --git a/src/libstd/sys/hermit/net.rs b/src/libstd/sys/hermit/net.rs index 5b5379c8b05..2fef8d381ca 100644 --- a/src/libstd/sys/hermit/net.rs +++ b/src/libstd/sys/hermit/net.rs @@ -1,10 +1,13 @@ use crate::convert::TryFrom; use crate::fmt; use crate::io::{self, ErrorKind, IoSlice, IoSliceMut}; -use crate::net::{Ipv4Addr, Ipv6Addr, Shutdown, SocketAddr}; +use crate::net::{IpAddr, Ipv4Addr, Ipv6Addr, Shutdown, SocketAddr}; use crate::str; +use crate::sync::Arc; use crate::sys::hermit::abi; +use crate::sys::hermit::abi::IpAddress::{Ipv4, Ipv6}; use crate::sys::{unsupported, Void}; +use crate::sys_common::AsInner; use crate::time::Duration; /// Checks whether the HermitCore's socket interface has been started already, and @@ -17,14 +20,37 @@ pub fn init() -> io::Result<()> { Ok(()) } -pub struct TcpStream(abi::Handle); +#[derive(Debug, Clone)] +pub struct Socket(abi::Handle); + +impl Socket { + fn new(handle: abi::Handle) -> Socket { + Socket(handle) + } +} + +impl AsInner for Socket { + fn as_inner(&self) -> &abi::Handle { + &self.0 + } +} + +impl Drop for Socket { + fn drop(&mut self) { + let _ = abi::tcpstream::close(self.0); + } +} + + +#[derive(Clone)] +pub struct TcpStream(Arc); impl TcpStream { pub fn connect(addr: io::Result<&SocketAddr>) -> io::Result { let addr = addr?; match abi::tcpstream::connect(addr.ip().to_string().as_bytes(), addr.port(), None) { - Ok(handle) => Ok(TcpStream(handle)), + Ok(handle) => Ok(TcpStream(Arc::new(Socket(handle)))), _ => { Err(io::Error::new(ErrorKind::Other, "Unable to initiate a connection on a socket")) } @@ -37,7 +63,7 @@ impl TcpStream { saddr.port(), Some(duration.as_millis() as u64), ) { - Ok(handle) => Ok(TcpStream(handle)), + Ok(handle) => Ok(TcpStream(Arc::new(Socket(handle)))), _ => { Err(io::Error::new(ErrorKind::Other, "Unable to initiate a connection on a socket")) } @@ -45,31 +71,34 @@ impl TcpStream { } pub fn set_read_timeout(&self, duration: Option) -> io::Result<()> { - abi::tcpstream::set_read_timeout(self.0, duration.map(|d| d.as_millis() as u64)) + abi::tcpstream::set_read_timeout(*self.0.as_inner(), duration.map(|d| d.as_millis() as u64)) .map_err(|_| io::Error::new(ErrorKind::Other, "Unable to set timeout value")) } pub fn set_write_timeout(&self, duration: Option) -> io::Result<()> { - abi::tcpstream::set_write_timeout(self.0, duration.map(|d| d.as_millis() as u64)) - .map_err(|_| io::Error::new(ErrorKind::Other, "Unable to set timeout value")) + abi::tcpstream::set_write_timeout( + *self.0.as_inner(), + duration.map(|d| d.as_millis() as u64), + ) + .map_err(|_| io::Error::new(ErrorKind::Other, "Unable to set timeout value")) } pub fn read_timeout(&self) -> io::Result> { - let duration = abi::tcpstream::get_read_timeout(self.0) + let duration = abi::tcpstream::get_read_timeout(*self.0.as_inner()) .map_err(|_| io::Error::new(ErrorKind::Other, "Unable to determine timeout value"))?; Ok(duration.map(|d| Duration::from_millis(d))) } pub fn write_timeout(&self) -> io::Result> { - let duration = abi::tcpstream::get_write_timeout(self.0) + let duration = abi::tcpstream::get_write_timeout(*self.0.as_inner()) .map_err(|_| io::Error::new(ErrorKind::Other, "Unable to determine timeout value"))?; Ok(duration.map(|d| Duration::from_millis(d))) } pub fn peek(&self, buf: &mut [u8]) -> io::Result { - abi::tcpstream::peek(self.0, buf) + abi::tcpstream::peek(*self.0.as_inner(), buf) .map_err(|_| io::Error::new(ErrorKind::Other, "set_nodelay failed")) } @@ -81,18 +110,11 @@ impl TcpStream { let mut size: usize = 0; for i in ioslice.iter_mut() { - let mut pos: usize = 0; + let ret = abi::tcpstream::read(*self.0.as_inner(), &mut i[0..]) + .map_err(|_| io::Error::new(ErrorKind::Other, "Unable to read on socket"))?; - while pos < i.len() { - let ret = abi::tcpstream::read(self.0, &mut i[pos..]) - .map_err(|_| io::Error::new(ErrorKind::Other, "Unable to read on socket"))?; - - if ret == 0 { - return Ok(size); - } else { - size += ret; - pos += ret; - } + if ret != 0 { + size += ret; } } @@ -112,7 +134,7 @@ impl TcpStream { let mut size: usize = 0; for i in ioslice.iter() { - size += abi::tcpstream::write(self.0, i) + size += abi::tcpstream::write(*self.0.as_inner(), i) .map_err(|_| io::Error::new(ErrorKind::Other, "Unable to write on socket"))?; } @@ -125,7 +147,32 @@ impl TcpStream { } pub fn peer_addr(&self) -> io::Result { - Err(io::Error::new(ErrorKind::Other, "peer_addr isn't supported")) + let (ipaddr, port) = abi::tcpstream::peer_addr(*self.0.as_inner()) + .map_err(|_| io::Error::new(ErrorKind::Other, "peer_addr failed"))?; + + let saddr = match ipaddr { + Ipv4(ref addr) => SocketAddr::new( + IpAddr::V4(Ipv4Addr::new(addr.0[0], addr.0[1], addr.0[2], addr.0[3])), + port, + ), + Ipv6(ref addr) => SocketAddr::new( + IpAddr::V6(Ipv6Addr::new( + ((addr.0[0] as u16) << 8) | addr.0[1] as u16, + ((addr.0[2] as u16) << 8) | addr.0[3] as u16, + ((addr.0[4] as u16) << 8) | addr.0[5] as u16, + ((addr.0[6] as u16) << 8) | addr.0[7] as u16, + ((addr.0[8] as u16) << 8) | addr.0[9] as u16, + ((addr.0[10] as u16) << 8) | addr.0[11] as u16, + ((addr.0[12] as u16) << 8) | addr.0[13] as u16, + ((addr.0[14] as u16) << 8) | addr.0[15] as u16)), + port, + ), + _ => { + return Err(io::Error::new(ErrorKind::Other, "peer_addr failed")); + }, + }; + + Ok(saddr) } pub fn socket_addr(&self) -> io::Result { @@ -133,34 +180,31 @@ impl TcpStream { } pub fn shutdown(&self, how: Shutdown) -> io::Result<()> { - abi::tcpstream::shutdown(self.0, how as i32) + abi::tcpstream::shutdown(*self.0.as_inner(), how as i32) .map_err(|_| io::Error::new(ErrorKind::Other, "unable to shutdown socket")) } pub fn duplicate(&self) -> io::Result { - let handle = abi::tcpstream::duplicate(self.0) - .map_err(|_| io::Error::new(ErrorKind::Other, "unable to duplicate stream"))?; - - Ok(TcpStream(handle)) + Ok(self.clone()) } pub fn set_nodelay(&self, mode: bool) -> io::Result<()> { - abi::tcpstream::set_nodelay(self.0, mode) + abi::tcpstream::set_nodelay(*self.0.as_inner(), mode) .map_err(|_| io::Error::new(ErrorKind::Other, "set_nodelay failed")) } pub fn nodelay(&self) -> io::Result { - abi::tcpstream::nodelay(self.0) + abi::tcpstream::nodelay(*self.0.as_inner()) .map_err(|_| io::Error::new(ErrorKind::Other, "nodelay failed")) } pub fn set_ttl(&self, tll: u32) -> io::Result<()> { - abi::tcpstream::set_tll(self.0, tll) + abi::tcpstream::set_tll(*self.0.as_inner(), tll) .map_err(|_| io::Error::new(ErrorKind::Other, "unable to set TTL")) } pub fn ttl(&self) -> io::Result { - abi::tcpstream::get_tll(self.0) + abi::tcpstream::get_tll(*self.0.as_inner()) .map_err(|_| io::Error::new(ErrorKind::Other, "unable to get TTL")) } @@ -169,40 +213,61 @@ impl TcpStream { } pub fn set_nonblocking(&self, mode: bool) -> io::Result<()> { - abi::tcpstream::set_nonblocking(self.0, mode) + abi::tcpstream::set_nonblocking(*self.0.as_inner(), mode) .map_err(|_| io::Error::new(ErrorKind::Other, "unable to set blocking mode")) } } -impl Drop for TcpStream { - fn drop(&mut self) { - let _ = abi::tcpstream::close(self.0); - } -} - impl fmt::Debug for TcpStream { fn fmt(&self, _f: &mut fmt::Formatter<'_>) -> fmt::Result { Ok(()) } } -pub struct TcpListener(abi::Handle); +#[derive(Clone)] +pub struct TcpListener(SocketAddr); impl TcpListener { - pub fn bind(_: io::Result<&SocketAddr>) -> io::Result { - Err(io::Error::new(ErrorKind::Other, "not supported")) + pub fn bind(addr: io::Result<&SocketAddr>) -> io::Result { + let addr = addr?; + + Ok(TcpListener(*addr)) } pub fn socket_addr(&self) -> io::Result { - Err(io::Error::new(ErrorKind::Other, "not supported")) + Ok(self.0) } pub fn accept(&self) -> io::Result<(TcpStream, SocketAddr)> { - Err(io::Error::new(ErrorKind::Other, "not supported")) + let (handle, ipaddr, port) = abi::tcplistener::accept(self.0.port()) + .map_err(|_| io::Error::new(ErrorKind::Other, "accept failed"))?; + let saddr = match ipaddr { + Ipv4(ref addr) => SocketAddr::new( + IpAddr::V4(Ipv4Addr::new(addr.0[0], addr.0[1], addr.0[2], addr.0[3])), + port, + ), + Ipv6(ref addr) => SocketAddr::new( + IpAddr::V6(Ipv6Addr::new( + ((addr.0[0] as u16) << 8) | addr.0[1] as u16, + ((addr.0[2] as u16) << 8) | addr.0[3] as u16, + ((addr.0[4] as u16) << 8) | addr.0[5] as u16, + ((addr.0[6] as u16) << 8) | addr.0[7] as u16, + ((addr.0[8] as u16) << 8) | addr.0[9] as u16, + ((addr.0[10] as u16) << 8) | addr.0[11] as u16, + ((addr.0[12] as u16) << 8) | addr.0[13] as u16, + ((addr.0[14] as u16) << 8) | addr.0[15] as u16)), + port, + ), + _ => { + return Err(io::Error::new(ErrorKind::Other, "accept failed")); + }, + }; + + Ok((TcpStream(Arc::new(Socket(handle))), saddr)) } pub fn duplicate(&self) -> io::Result { - Err(io::Error::new(ErrorKind::Other, "not supported")) + Ok(self.clone()) } pub fn set_ttl(&self, _: u32) -> io::Result<()> { From c99116afe37d5a1dde65ed8a2e107892be81b20a Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sun, 14 Jun 2020 00:38:31 +0200 Subject: [PATCH 02/11] remove unused function --- src/libstd/sys/hermit/net.rs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/libstd/sys/hermit/net.rs b/src/libstd/sys/hermit/net.rs index 2fef8d381ca..70c010e6232 100644 --- a/src/libstd/sys/hermit/net.rs +++ b/src/libstd/sys/hermit/net.rs @@ -23,12 +23,6 @@ pub fn init() -> io::Result<()> { #[derive(Debug, Clone)] pub struct Socket(abi::Handle); -impl Socket { - fn new(handle: abi::Handle) -> Socket { - Socket(handle) - } -} - impl AsInner for Socket { fn as_inner(&self) -> &abi::Handle { &self.0 From fd86a847206dd2333c23c768b8c0564e15a05c1c Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sun, 14 Jun 2020 00:39:14 +0200 Subject: [PATCH 03/11] use latest interface to HermitCore --- Cargo.lock | 4 ++-- src/libstd/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bbbcf797f75..009767934d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1434,9 +1434,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91780f809e750b0a89f5544be56617ff6b1227ee485bcb06ebe10cdf89bd3b71" +checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909" dependencies = [ "compiler_builtins", "libc", diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index 6af1cbb34b6..83029a86420 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -41,7 +41,7 @@ dlmalloc = { version = "0.1", features = ['rustc-dep-of-std'] } fortanix-sgx-abi = { version = "0.3.2", features = ['rustc-dep-of-std'] } [target.'cfg(all(any(target_arch = "x86_64", target_arch = "aarch64"), target_os = "hermit"))'.dependencies] -hermit-abi = { version = "0.1.13", features = ['rustc-dep-of-std'] } +hermit-abi = { version = "0.1.14", features = ['rustc-dep-of-std'] } [target.wasm32-wasi.dependencies] wasi = { version = "0.9.0", features = ['rustc-dep-of-std'], default-features = false } From d221ffc68e543f4a38efcc2bd34f52145f89003b Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sun, 14 Jun 2020 23:43:54 +0200 Subject: [PATCH 04/11] simplify conversion to IpAddr::V6 --- src/libstd/sys/hermit/net.rs | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/libstd/sys/hermit/net.rs b/src/libstd/sys/hermit/net.rs index 70c010e6232..cba8d6aaca6 100644 --- a/src/libstd/sys/hermit/net.rs +++ b/src/libstd/sys/hermit/net.rs @@ -150,15 +150,7 @@ impl TcpStream { port, ), Ipv6(ref addr) => SocketAddr::new( - IpAddr::V6(Ipv6Addr::new( - ((addr.0[0] as u16) << 8) | addr.0[1] as u16, - ((addr.0[2] as u16) << 8) | addr.0[3] as u16, - ((addr.0[4] as u16) << 8) | addr.0[5] as u16, - ((addr.0[6] as u16) << 8) | addr.0[7] as u16, - ((addr.0[8] as u16) << 8) | addr.0[9] as u16, - ((addr.0[10] as u16) << 8) | addr.0[11] as u16, - ((addr.0[12] as u16) << 8) | addr.0[13] as u16, - ((addr.0[14] as u16) << 8) | addr.0[15] as u16)), + IpAddr::V6(Ipv6Addr::new(addr.0)), port, ), _ => { @@ -241,15 +233,7 @@ impl TcpListener { port, ), Ipv6(ref addr) => SocketAddr::new( - IpAddr::V6(Ipv6Addr::new( - ((addr.0[0] as u16) << 8) | addr.0[1] as u16, - ((addr.0[2] as u16) << 8) | addr.0[3] as u16, - ((addr.0[4] as u16) << 8) | addr.0[5] as u16, - ((addr.0[6] as u16) << 8) | addr.0[7] as u16, - ((addr.0[8] as u16) << 8) | addr.0[9] as u16, - ((addr.0[10] as u16) << 8) | addr.0[11] as u16, - ((addr.0[12] as u16) << 8) | addr.0[13] as u16, - ((addr.0[14] as u16) << 8) | addr.0[15] as u16)), + IpAddr::V6(Ipv6Addr::new(addr.0)), port, ), _ => { From 9d596b50f15dfff47fa2272ee63cdc9aeb9307fa Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Mon, 15 Jun 2020 07:28:53 +0200 Subject: [PATCH 05/11] changes to pass the format check --- src/libstd/sys/hermit/net.rs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/libstd/sys/hermit/net.rs b/src/libstd/sys/hermit/net.rs index cba8d6aaca6..ced554d8790 100644 --- a/src/libstd/sys/hermit/net.rs +++ b/src/libstd/sys/hermit/net.rs @@ -149,13 +149,10 @@ impl TcpStream { IpAddr::V4(Ipv4Addr::new(addr.0[0], addr.0[1], addr.0[2], addr.0[3])), port, ), - Ipv6(ref addr) => SocketAddr::new( - IpAddr::V6(Ipv6Addr::new(addr.0)), - port, - ), + Ipv6(ref addr) => SocketAddr::new(IpAddr::V6(Ipv6Addr::new(addr.0)), port), _ => { return Err(io::Error::new(ErrorKind::Other, "peer_addr failed")); - }, + } }; Ok(saddr) @@ -232,13 +229,10 @@ impl TcpListener { IpAddr::V4(Ipv4Addr::new(addr.0[0], addr.0[1], addr.0[2], addr.0[3])), port, ), - Ipv6(ref addr) => SocketAddr::new( - IpAddr::V6(Ipv6Addr::new(addr.0)), - port, - ), + Ipv6(ref addr) => SocketAddr::new(IpAddr::V6(Ipv6Addr::new(addr.0)), port), _ => { return Err(io::Error::new(ErrorKind::Other, "accept failed")); - }, + } }; Ok((TcpStream(Arc::new(Socket(handle))), saddr)) From 810ba395638f622b4e7f11c2f056382db4d2fa05 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Mon, 15 Jun 2020 08:07:56 +0200 Subject: [PATCH 06/11] remove obsolete line --- src/libstd/sys/hermit/net.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libstd/sys/hermit/net.rs b/src/libstd/sys/hermit/net.rs index ced554d8790..fbb562fa510 100644 --- a/src/libstd/sys/hermit/net.rs +++ b/src/libstd/sys/hermit/net.rs @@ -35,7 +35,6 @@ impl Drop for Socket { } } - #[derive(Clone)] pub struct TcpStream(Arc); From aa53a037a286a05c88e61ca008d90354cccb1512 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Mon, 15 Jun 2020 08:43:08 +0200 Subject: [PATCH 07/11] Revert "changes to pass the format check" This reverts commit 9d596b50f15dfff47fa2272ee63cdc9aeb9307fa. --- src/libstd/sys/hermit/net.rs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/libstd/sys/hermit/net.rs b/src/libstd/sys/hermit/net.rs index fbb562fa510..8f96f8622c6 100644 --- a/src/libstd/sys/hermit/net.rs +++ b/src/libstd/sys/hermit/net.rs @@ -148,10 +148,13 @@ impl TcpStream { IpAddr::V4(Ipv4Addr::new(addr.0[0], addr.0[1], addr.0[2], addr.0[3])), port, ), - Ipv6(ref addr) => SocketAddr::new(IpAddr::V6(Ipv6Addr::new(addr.0)), port), + Ipv6(ref addr) => SocketAddr::new( + IpAddr::V6(Ipv6Addr::new(addr.0)), + port, + ), _ => { return Err(io::Error::new(ErrorKind::Other, "peer_addr failed")); - } + }, }; Ok(saddr) @@ -228,10 +231,13 @@ impl TcpListener { IpAddr::V4(Ipv4Addr::new(addr.0[0], addr.0[1], addr.0[2], addr.0[3])), port, ), - Ipv6(ref addr) => SocketAddr::new(IpAddr::V6(Ipv6Addr::new(addr.0)), port), + Ipv6(ref addr) => SocketAddr::new( + IpAddr::V6(Ipv6Addr::new(addr.0)), + port, + ), _ => { return Err(io::Error::new(ErrorKind::Other, "accept failed")); - } + }, }; Ok((TcpStream(Arc::new(Socket(handle))), saddr)) From 9c9f21fb23ae59012e7aba162e1105d26fcd119b Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Mon, 15 Jun 2020 08:43:44 +0200 Subject: [PATCH 08/11] Revert "simplify conversion to IpAddr::V6" This reverts commit d221ffc68e543f4a38efcc2bd34f52145f89003b. --- src/libstd/sys/hermit/net.rs | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/libstd/sys/hermit/net.rs b/src/libstd/sys/hermit/net.rs index 8f96f8622c6..a02f1131329 100644 --- a/src/libstd/sys/hermit/net.rs +++ b/src/libstd/sys/hermit/net.rs @@ -149,7 +149,15 @@ impl TcpStream { port, ), Ipv6(ref addr) => SocketAddr::new( - IpAddr::V6(Ipv6Addr::new(addr.0)), + IpAddr::V6(Ipv6Addr::new( + ((addr.0[0] as u16) << 8) | addr.0[1] as u16, + ((addr.0[2] as u16) << 8) | addr.0[3] as u16, + ((addr.0[4] as u16) << 8) | addr.0[5] as u16, + ((addr.0[6] as u16) << 8) | addr.0[7] as u16, + ((addr.0[8] as u16) << 8) | addr.0[9] as u16, + ((addr.0[10] as u16) << 8) | addr.0[11] as u16, + ((addr.0[12] as u16) << 8) | addr.0[13] as u16, + ((addr.0[14] as u16) << 8) | addr.0[15] as u16)), port, ), _ => { @@ -232,7 +240,15 @@ impl TcpListener { port, ), Ipv6(ref addr) => SocketAddr::new( - IpAddr::V6(Ipv6Addr::new(addr.0)), + IpAddr::V6(Ipv6Addr::new( + ((addr.0[0] as u16) << 8) | addr.0[1] as u16, + ((addr.0[2] as u16) << 8) | addr.0[3] as u16, + ((addr.0[4] as u16) << 8) | addr.0[5] as u16, + ((addr.0[6] as u16) << 8) | addr.0[7] as u16, + ((addr.0[8] as u16) << 8) | addr.0[9] as u16, + ((addr.0[10] as u16) << 8) | addr.0[11] as u16, + ((addr.0[12] as u16) << 8) | addr.0[13] as u16, + ((addr.0[14] as u16) << 8) | addr.0[15] as u16)), port, ), _ => { From 6c983a733550ff37cb603f409901f3b3d0eaa8c2 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Mon, 15 Jun 2020 08:53:58 +0200 Subject: [PATCH 09/11] use Ipv6Addr::from to build the IPv6 address --- src/libstd/sys/hermit/net.rs | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/src/libstd/sys/hermit/net.rs b/src/libstd/sys/hermit/net.rs index a02f1131329..6410dec756d 100644 --- a/src/libstd/sys/hermit/net.rs +++ b/src/libstd/sys/hermit/net.rs @@ -148,18 +148,7 @@ impl TcpStream { IpAddr::V4(Ipv4Addr::new(addr.0[0], addr.0[1], addr.0[2], addr.0[3])), port, ), - Ipv6(ref addr) => SocketAddr::new( - IpAddr::V6(Ipv6Addr::new( - ((addr.0[0] as u16) << 8) | addr.0[1] as u16, - ((addr.0[2] as u16) << 8) | addr.0[3] as u16, - ((addr.0[4] as u16) << 8) | addr.0[5] as u16, - ((addr.0[6] as u16) << 8) | addr.0[7] as u16, - ((addr.0[8] as u16) << 8) | addr.0[9] as u16, - ((addr.0[10] as u16) << 8) | addr.0[11] as u16, - ((addr.0[12] as u16) << 8) | addr.0[13] as u16, - ((addr.0[14] as u16) << 8) | addr.0[15] as u16)), - port, - ), + Ipv6(ref addr) => SocketAddr::new(IpAddr::V6(Ipv6Addr::from(addr.0)), port), _ => { return Err(io::Error::new(ErrorKind::Other, "peer_addr failed")); }, @@ -239,18 +228,7 @@ impl TcpListener { IpAddr::V4(Ipv4Addr::new(addr.0[0], addr.0[1], addr.0[2], addr.0[3])), port, ), - Ipv6(ref addr) => SocketAddr::new( - IpAddr::V6(Ipv6Addr::new( - ((addr.0[0] as u16) << 8) | addr.0[1] as u16, - ((addr.0[2] as u16) << 8) | addr.0[3] as u16, - ((addr.0[4] as u16) << 8) | addr.0[5] as u16, - ((addr.0[6] as u16) << 8) | addr.0[7] as u16, - ((addr.0[8] as u16) << 8) | addr.0[9] as u16, - ((addr.0[10] as u16) << 8) | addr.0[11] as u16, - ((addr.0[12] as u16) << 8) | addr.0[13] as u16, - ((addr.0[14] as u16) << 8) | addr.0[15] as u16)), - port, - ), + Ipv6(ref addr) => SocketAddr::new(IpAddr::V6(Ipv6Addr::from(addr.0)), port), _ => { return Err(io::Error::new(ErrorKind::Other, "accept failed")); }, From a8e3746e9160b8a433c95df7114e5760592a62e8 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Mon, 15 Jun 2020 09:29:32 +0200 Subject: [PATCH 10/11] add comment about the usage of Arc --- src/libstd/sys/hermit/net.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libstd/sys/hermit/net.rs b/src/libstd/sys/hermit/net.rs index 6410dec756d..9146dfc55f4 100644 --- a/src/libstd/sys/hermit/net.rs +++ b/src/libstd/sys/hermit/net.rs @@ -35,6 +35,9 @@ impl Drop for Socket { } } +// Arc is used to count the number of used sockets. +// Only if all sockets are released, the drop +// method will close the socket. #[derive(Clone)] pub struct TcpStream(Arc); From 76f1581a25a27029279bb5eac17971ba68df1dbe Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Mon, 15 Jun 2020 10:05:14 +0200 Subject: [PATCH 11/11] remove obsolete , to pass the format check --- src/libstd/sys/hermit/net.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libstd/sys/hermit/net.rs b/src/libstd/sys/hermit/net.rs index 9146dfc55f4..9e588c4265a 100644 --- a/src/libstd/sys/hermit/net.rs +++ b/src/libstd/sys/hermit/net.rs @@ -154,7 +154,7 @@ impl TcpStream { Ipv6(ref addr) => SocketAddr::new(IpAddr::V6(Ipv6Addr::from(addr.0)), port), _ => { return Err(io::Error::new(ErrorKind::Other, "peer_addr failed")); - }, + } }; Ok(saddr) @@ -234,7 +234,7 @@ impl TcpListener { Ipv6(ref addr) => SocketAddr::new(IpAddr::V6(Ipv6Addr::from(addr.0)), port), _ => { return Err(io::Error::new(ErrorKind::Other, "accept failed")); - }, + } }; Ok((TcpStream(Arc::new(Socket(handle))), saddr))