Skip to content

Change everything returning libc::sockaddr_storage to use an &mut out-... #16251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 4, 2014
Merged

Change everything returning libc::sockaddr_storage to use an &mut out-... #16251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions src/libnative/io/net.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,26 +66,27 @@ fn ip_to_inaddr(ip: rtio::IpAddr) -> InAddr {
}
}

fn addr_to_sockaddr(addr: rtio::SocketAddr) -> (libc::sockaddr_storage, uint) {
fn addr_to_sockaddr(addr: rtio::SocketAddr,
storage: &mut libc::sockaddr_storage)
-> libc::socklen_t {
unsafe {
let storage: libc::sockaddr_storage = mem::zeroed();
let len = match ip_to_inaddr(addr.ip) {
InAddr(inaddr) => {
let storage: *mut libc::sockaddr_in = mem::transmute(&storage);
let storage = storage as *mut _ as *mut libc::sockaddr_in;
(*storage).sin_family = libc::AF_INET as libc::sa_family_t;
(*storage).sin_port = htons(addr.port);
(*storage).sin_addr = inaddr;
mem::size_of::<libc::sockaddr_in>()
}
In6Addr(inaddr) => {
let storage: *mut libc::sockaddr_in6 = mem::transmute(&storage);
let storage = storage as *mut _ as *mut libc::sockaddr_in6;
(*storage).sin6_family = libc::AF_INET6 as libc::sa_family_t;
(*storage).sin6_port = htons(addr.port);
(*storage).sin6_addr = inaddr;
mem::size_of::<libc::sockaddr_in6>()
}
};
return (storage, len);
return len as libc::socklen_t;
}
}

Expand Down Expand Up @@ -277,9 +278,9 @@ impl TcpStream {
let fd = try!(socket(addr, libc::SOCK_STREAM));
let ret = TcpStream::new(Inner::new(fd));

let (addr, len) = addr_to_sockaddr(addr);
let addrp = &addr as *const _ as *const libc::sockaddr;
let len = len as libc::socklen_t;
let mut storage = unsafe { mem::zeroed() };
let len = addr_to_sockaddr(addr, &mut storage);
let addrp = &storage as *const _ as *const libc::sockaddr;

match timeout {
Some(timeout) => {
Expand Down Expand Up @@ -457,9 +458,9 @@ impl TcpListener {
let fd = try!(socket(addr, libc::SOCK_STREAM));
let ret = TcpListener { inner: Inner::new(fd) };

let (addr, len) = addr_to_sockaddr(addr);
let addrp = &addr as *const _ as *const libc::sockaddr;
let len = len as libc::socklen_t;
let mut storage = unsafe { mem::zeroed() };
let len = addr_to_sockaddr(addr, &mut storage);
let addrp = &storage as *const _ as *const libc::sockaddr;

// On platforms with Berkeley-derived sockets, this allows
// to quickly rebind a socket, without needing to wait for
Expand Down Expand Up @@ -566,9 +567,9 @@ impl UdpSocket {
write_deadline: 0,
};

let (addr, len) = addr_to_sockaddr(addr);
let addrp = &addr as *const _ as *const libc::sockaddr;
let len = len as libc::socklen_t;
let mut storage = unsafe { mem::zeroed() };
let len = addr_to_sockaddr(addr, &mut storage);
let addrp = &storage as *const _ as *const libc::sockaddr;

match unsafe { libc::bind(fd, addrp, len) } {
-1 => Err(last_error()),
Expand Down Expand Up @@ -656,9 +657,9 @@ impl rtio::RtioUdpSocket for UdpSocket {
}

fn send_to(&mut self, buf: &[u8], dst: rtio::SocketAddr) -> IoResult<()> {
let (dst, dstlen) = addr_to_sockaddr(dst);
let dstp = &dst as *const _ as *const libc::sockaddr;
let dstlen = dstlen as libc::socklen_t;
let mut storage = unsafe { mem::zeroed() };
let dstlen = addr_to_sockaddr(dst, &mut storage);
let dstp = &storage as *const _ as *const libc::sockaddr;

let fd = self.fd();
let dolock = || self.lock_nonblocking();
Expand Down
22 changes: 12 additions & 10 deletions src/libnative/io/pipe_unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@ fn unix_socket(ty: libc::c_int) -> IoResult<fd_t> {
}
}

fn addr_to_sockaddr_un(addr: &CString) -> IoResult<(libc::sockaddr_storage, uint)> {
fn addr_to_sockaddr_un(addr: &CString,
storage: &mut libc::sockaddr_storage)
-> IoResult<libc::socklen_t> {
// the sun_path length is limited to SUN_LEN (with null)
assert!(mem::size_of::<libc::sockaddr_storage>() >=
mem::size_of::<libc::sockaddr_un>());
let mut storage: libc::sockaddr_storage = unsafe { mem::zeroed() };
let s: &mut libc::sockaddr_un = unsafe { mem::transmute(&mut storage) };
let s = unsafe { &mut *(storage as *mut _ as *mut libc::sockaddr_un) };

let len = addr.len();
if len > s.sun_path.len() - 1 {
Expand All @@ -53,7 +54,7 @@ fn addr_to_sockaddr_un(addr: &CString) -> IoResult<(libc::sockaddr_storage, uint

// count the null terminator
let len = mem::size_of::<libc::sa_family_t>() + len + 1;
return Ok((storage, len));
return Ok(len as libc::socklen_t);
}

struct Inner {
Expand All @@ -76,10 +77,10 @@ impl Drop for Inner {

fn connect(addr: &CString, ty: libc::c_int,
timeout: Option<u64>) -> IoResult<Inner> {
let (addr, len) = try!(addr_to_sockaddr_un(addr));
let mut storage = unsafe { mem::zeroed() };
let len = try!(addr_to_sockaddr_un(addr, &mut storage));
let inner = Inner::new(try!(unix_socket(ty)));
let addrp = &addr as *const _ as *const libc::sockaddr;
let len = len as libc::socklen_t;
let addrp = &storage as *const _ as *const libc::sockaddr;

match timeout {
None => {
Expand All @@ -96,11 +97,12 @@ fn connect(addr: &CString, ty: libc::c_int,
}

fn bind(addr: &CString, ty: libc::c_int) -> IoResult<Inner> {
let (addr, len) = try!(addr_to_sockaddr_un(addr));
let mut storage = unsafe { mem::zeroed() };
let len = try!(addr_to_sockaddr_un(addr, &mut storage));
let inner = Inner::new(try!(unix_socket(ty)));
let addrp = &addr as *const _;
let addrp = &storage as *const _ as *const libc::sockaddr;
match unsafe {
libc::bind(inner.fd, addrp as *const _, len as libc::socklen_t)
libc::bind(inner.fd, addrp, len)
} {
-1 => Err(super::last_error()),
_ => Ok(inner)
Expand Down
43 changes: 23 additions & 20 deletions src/librustuv/net.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,17 @@ pub fn sockaddr_to_addr(storage: &libc::sockaddr_storage,
}
}

fn addr_to_sockaddr(addr: rtio::SocketAddr) -> (libc::sockaddr_storage, uint) {
fn addr_to_sockaddr(addr: rtio::SocketAddr,
storage: &mut libc::sockaddr_storage)
-> libc::socklen_t {
unsafe {
let mut storage: libc::sockaddr_storage = mem::zeroed();
let len = match addr.ip {
rtio::Ipv4Addr(a, b, c, d) => {
let ip = (a as u32 << 24) |
(b as u32 << 16) |
(c as u32 << 8) |
(d as u32 << 0);
let storage: &mut libc::sockaddr_in =
mem::transmute(&mut storage);
let storage = storage as *mut _ as *mut libc::sockaddr_in;
(*storage).sin_family = libc::AF_INET as libc::sa_family_t;
(*storage).sin_port = htons(addr.port);
(*storage).sin_addr = libc::in_addr {
Expand All @@ -95,11 +95,10 @@ fn addr_to_sockaddr(addr: rtio::SocketAddr) -> (libc::sockaddr_storage, uint) {
mem::size_of::<libc::sockaddr_in>()
}
rtio::Ipv6Addr(a, b, c, d, e, f, g, h) => {
let storage: &mut libc::sockaddr_in6 =
mem::transmute(&mut storage);
storage.sin6_family = libc::AF_INET6 as libc::sa_family_t;
storage.sin6_port = htons(addr.port);
storage.sin6_addr = libc::in6_addr {
let storage = storage as *mut _ as *mut libc::sockaddr_in6;
(*storage).sin6_family = libc::AF_INET6 as libc::sa_family_t;
(*storage).sin6_port = htons(addr.port);
(*storage).sin6_addr = libc::in6_addr {
s6_addr: [
htons(a),
htons(b),
Expand All @@ -114,7 +113,7 @@ fn addr_to_sockaddr(addr: rtio::SocketAddr) -> (libc::sockaddr_storage, uint) {
mem::size_of::<libc::sockaddr_in6>()
}
};
return (storage, len);
return len as libc::socklen_t
}
}

Expand Down Expand Up @@ -203,8 +202,9 @@ impl TcpWatcher {
timeout: Option<u64>) -> Result<TcpWatcher, UvError> {
let tcp = TcpWatcher::new(io);
let cx = ConnectCtx { status: -1, task: None, timer: None };
let (addr, _len) = addr_to_sockaddr(address);
let addr_p = &addr as *const _ as *const libc::sockaddr;
let mut storage = unsafe { mem::zeroed() };
let _len = addr_to_sockaddr(address, &mut storage);
let addr_p = &storage as *const _ as *const libc::sockaddr;
cx.connect(tcp, timeout, io, |req, tcp, cb| {
unsafe { uvll::uv_tcp_connect(req.handle, tcp.handle, addr_p, cb) }
})
Expand Down Expand Up @@ -361,10 +361,11 @@ impl TcpListener {
outgoing: tx,
incoming: rx,
};
let (addr, _len) = addr_to_sockaddr(address);
let mut storage = unsafe { mem::zeroed() };
let _len = addr_to_sockaddr(address, &mut storage);
let res = unsafe {
let addr_p = &addr as *const libc::sockaddr_storage;
uvll::uv_tcp_bind(l.handle, addr_p as *const libc::sockaddr)
let addr_p = &storage as *const _ as *const libc::sockaddr;
uvll::uv_tcp_bind(l.handle, addr_p)
};
return match res {
0 => Ok(l.install()),
Expand Down Expand Up @@ -513,10 +514,11 @@ impl UdpWatcher {
assert_eq!(unsafe {
uvll::uv_udp_init(io.uv_loop(), udp.handle)
}, 0);
let (addr, _len) = addr_to_sockaddr(address);
let mut storage = unsafe { mem::zeroed() };
let _len = addr_to_sockaddr(address, &mut storage);
let result = unsafe {
let addr_p = &addr as *const libc::sockaddr_storage;
uvll::uv_udp_bind(udp.handle, addr_p as *const libc::sockaddr, 0u32)
let addr_p = &storage as *const _ as *const libc::sockaddr;
uvll::uv_udp_bind(udp.handle, addr_p, 0u32)
};
return match result {
0 => Ok(udp),
Expand Down Expand Up @@ -614,8 +616,9 @@ impl rtio::RtioUdpSocket for UdpWatcher {
let guard = try!(self.write_access.grant(m));

let mut req = Request::new(uvll::UV_UDP_SEND);
let (addr, _len) = addr_to_sockaddr(dst);
let addr_p = &addr as *const _ as *const libc::sockaddr;
let mut storage = unsafe { mem::zeroed() };
let _len = addr_to_sockaddr(dst, &mut storage);
let addr_p = &storage as *const _ as *const libc::sockaddr;

// see comments in StreamWatcher::write for why we may allocate a buffer
// here.
Expand Down