diff options
| author | Milan <milanlandaverde@gmail.com> | 2021-10-07 10:19:45 -0400 |
|---|---|---|
| committer | Milan <milanlandaverde@gmail.com> | 2021-10-10 14:01:36 -0400 |
| commit | 15b119897c40cbc76f5e1c65370930773dfdc741 (patch) | |
| tree | 3487acdf7008ca6c1911e15a1ed2416a5955e1f6 | |
| parent | 92d680589c1e7c9a21a7e31ce98b7a7f09bcc65f (diff) | |
integrate I/O safety changes
| -rw-r--r-- | library/std/src/os/unix/net/datagram.rs | 6 | ||||
| -rw-r--r-- | library/std/src/os/unix/net/listener.rs | 5 | ||||
| -rw-r--r-- | library/std/src/os/unix/net/stream.rs | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/library/std/src/os/unix/net/datagram.rs b/library/std/src/os/unix/net/datagram.rs index 87be4d3f57a..a2caccc7849 100644 --- a/library/std/src/os/unix/net/datagram.rs +++ b/library/std/src/os/unix/net/datagram.rs @@ -139,7 +139,7 @@ impl UnixDatagram { unsafe { let socket = UnixDatagram::unbound()?; cvt(libc::bind( - *socket.0.as_inner(), + socket.as_raw_fd(), &socket_addr.addr as *const _ as *const _, socket_addr.len as _, ))?; @@ -254,7 +254,7 @@ impl UnixDatagram { pub fn connect_addr(&self, socket_addr: &SocketAddr) -> io::Result<()> { unsafe { cvt(libc::connect( - *self.0.as_inner(), + self.as_raw_fd(), &socket_addr.addr as *const _ as *const _, socket_addr.len, ))?; @@ -568,7 +568,7 @@ impl UnixDatagram { pub fn send_to_addr(&self, buf: &[u8], socket_addr: &SocketAddr) -> io::Result<usize> { unsafe { let count = cvt(libc::sendto( - *self.0.as_inner(), + self.as_raw_fd(), buf.as_ptr() as *const _, buf.len(), MSG_NOSIGNAL, diff --git a/library/std/src/os/unix/net/listener.rs b/library/std/src/os/unix/net/listener.rs index 7fba7543ec2..97348afe7de 100644 --- a/library/std/src/os/unix/net/listener.rs +++ b/library/std/src/os/unix/net/listener.rs @@ -110,12 +110,11 @@ impl UnixListener { unsafe { let inner = Socket::new_raw(libc::AF_UNIX, libc::SOCK_STREAM)?; cvt(libc::bind( - *inner.as_inner(), + inner.as_raw_fd(), &socket_addr.addr as *const _ as *const _, socket_addr.len as _, ))?; - cvt(libc::listen(*inner.as_inner(), 128))?; - + cvt(libc::listen(inner.as_raw_fd(), 128))?; Ok(UnixListener(inner)) } } diff --git a/library/std/src/os/unix/net/stream.rs b/library/std/src/os/unix/net/stream.rs index e3eef7c7614..6120d557227 100644 --- a/library/std/src/os/unix/net/stream.rs +++ b/library/std/src/os/unix/net/stream.rs @@ -135,7 +135,7 @@ impl UnixStream { unsafe { let inner = Socket::new_raw(libc::AF_UNIX, libc::SOCK_STREAM)?; cvt(libc::connect( - *inner.as_inner(), + inner.as_raw_fd(), &socket_addr.addr as *const _ as *const _, socket_addr.len, ))?; |