itsscb/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-11-17 17:16:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

integrate I/O safety changes

Browse Source
This commit is contained in:
Milan 2021-10-07 10:19:45 -04:00
parent 92d680589c
commit 15b119897c
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/std/src/os/unix/net/datagram.rs
View File

@ -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,

5
library/std/src/os/unix/net/listener.rs
View File

@ -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))
}
}

2
library/std/src/os/unix/net/stream.rs
View File

@ -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,
))?;