From 88988a31a017ffada1528029c910b56b12ac281b Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Sun, 22 Feb 2015 20:50:34 -0800 Subject: Remove prefix from SockAddr variants --- src/sys/socket/addr.rs | 16 ++++++++-------- src/sys/socket/mod.rs | 49 +++++++++++++++++++------------------------------ 2 files changed, 27 insertions(+), 38 deletions(-) (limited to 'src') diff --git a/src/sys/socket/addr.rs b/src/sys/socket/addr.rs index 91d2c0d1..7a814d15 100644 --- a/src/sys/socket/addr.rs +++ b/src/sys/socket/addr.rs @@ -9,9 +9,9 @@ use std::os::unix::OsStrExt; #[derive(Copy)] pub enum SockAddr { // TODO: Rename these variants IpV4, IpV6, Unix - SockIpV4(sockaddr_in), - SockIpV6(sockaddr_in6), - SockUnix(sockaddr_un) + IpV4(sockaddr_in), + IpV6(sockaddr_in6), + Unix(sockaddr_un) } /// A trait for values which can be converted or resolved to a SockAddr. @@ -40,7 +40,7 @@ impl ToSockAddr for path::Path { fn to_sock_addr(&self) -> NixResult { let bytes = self.as_os_str().as_bytes(); - Ok(SockAddr::SockUnix(unsafe { + Ok(SockAddr::Unix(unsafe { let mut ret = sockaddr_un { sun_family: AF_UNIX as sa_family_t, .. mem::zeroed() @@ -71,7 +71,7 @@ impl ToSockAddr for net::SocketAddr { match self.ip() { IpAddr::V4(ip) => { let addr = ip.octets(); - Ok(SockAddr::SockIpV4(sockaddr_in { + Ok(SockAddr::IpV4(sockaddr_in { sin_family: AF_INET as sa_family_t, sin_port: self.port(), sin_addr: in_addr { @@ -100,7 +100,7 @@ impl FromSockAddr for net::SocketAddr { use std::num::Int; match *addr { - SockAddr::SockIpV4(ref addr) => { + SockAddr::IpV4(ref addr) => { let ip = Int::from_be(addr.sin_addr.s_addr); let ip = Ipv4Addr::new( ((ip >> 24) as u8) & 0xff, @@ -110,7 +110,7 @@ impl FromSockAddr for net::SocketAddr { Some(net::SocketAddr::new(IpAddr::V4(ip), addr.sin_port)) } - SockAddr::SockIpV6(_) => unimplemented!(), + SockAddr::IpV6(_) => unimplemented!(), _ => None, } } @@ -118,7 +118,7 @@ impl FromSockAddr for net::SocketAddr { impl FromSockAddr for path::PathBuf { fn from_sock_addr(addr: &SockAddr) -> Option { - if let SockAddr::SockUnix(ref addr) = *addr { + if let SockAddr::Unix(ref addr) = *addr { unsafe { let bytes = CStr::from_ptr(addr.sun_path.as_ptr()).to_bytes(); let osstr = ::from_bytes(bytes); diff --git a/src/sys/socket/mod.rs b/src/sys/socket/mod.rs index a5c2c97a..7e8afbfd 100644 --- a/src/sys/socket/mod.rs +++ b/src/sys/socket/mod.rs @@ -75,14 +75,12 @@ pub fn listen(sockfd: Fd, backlog: usize) -> NixResult<()> { } pub fn bind(sockfd: Fd, addr: &A) -> NixResult<()> { - use self::addr::SockAddr::*; - let res = unsafe { try!(addr.with_sock_addr(|addr| { match *addr { - SockIpV4(ref addr) => ffi::bind(sockfd, mem::transmute(addr), mem::size_of::() as socklen_t), - SockIpV6(ref addr) => ffi::bind(sockfd, mem::transmute(addr), mem::size_of::() as socklen_t), - SockUnix(ref addr) => ffi::bind(sockfd, mem::transmute(addr), mem::size_of::() as socklen_t) + SockAddr::IpV4(ref addr) => ffi::bind(sockfd, mem::transmute(addr), mem::size_of::() as socklen_t), + SockAddr::IpV6(ref addr) => ffi::bind(sockfd, mem::transmute(addr), mem::size_of::() as socklen_t), + SockAddr::Unix(ref addr) => ffi::bind(sockfd, mem::transmute(addr), mem::size_of::() as socklen_t) } })) }; @@ -152,14 +150,12 @@ fn accept4_polyfill(sockfd: Fd, flags: SockFlag) -> NixResult { } pub fn connect(sockfd: Fd, addr: &A) -> NixResult<()> { - use self::addr::SockAddr::*; - let res = unsafe { try!(addr.with_sock_addr(|addr| { match *addr { - SockIpV4(ref addr) => ffi::connect(sockfd, mem::transmute(addr), mem::size_of::() as socklen_t), - SockIpV6(ref addr) => ffi::connect(sockfd, mem::transmute(addr), mem::size_of::() as socklen_t), - SockUnix(ref addr) => ffi::connect(sockfd, mem::transmute(addr), mem::size_of::() as socklen_t) + SockAddr::IpV4(ref addr) => ffi::connect(sockfd, mem::transmute(addr), mem::size_of::() as socklen_t), + SockAddr::IpV6(ref addr) => ffi::connect(sockfd, mem::transmute(addr), mem::size_of::() as socklen_t), + SockAddr::Unix(ref addr) => ffi::connect(sockfd, mem::transmute(addr), mem::size_of::() as socklen_t) } })) }; @@ -171,21 +167,20 @@ mod sa_helpers { use std::mem; use libc::{sockaddr_storage, sockaddr_in, sockaddr_in6, sockaddr_un}; use super::SockAddr; - use super::SockAddr::*; pub fn to_sockaddr_ipv4(addr: &sockaddr_storage) -> SockAddr { let sin : &sockaddr_in = unsafe { mem::transmute(addr) }; - SockIpV4( *sin ) + SockAddr::IpV4( *sin ) } pub fn to_sockaddr_ipv6(addr: &sockaddr_storage) -> SockAddr { let sin6 : &sockaddr_in6 = unsafe { mem::transmute(addr) }; - SockIpV6( *sin6 ) + SockAddr::IpV6( *sin6 ) } pub fn to_sockaddr_unix(addr: &sockaddr_storage) -> SockAddr { let sun : &sockaddr_un = unsafe { mem::transmute(addr) }; - SockUnix( *sun ) + SockAddr::Unix( *sun ) } } @@ -228,7 +223,7 @@ fn print_ipv4_addr(sin: &sockaddr_in, f: &mut fmt::Formatter) -> fmt::Result { impl fmt::Debug for SockAddr { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match *self { - SockAddr::SockIpV4(sin) => print_ipv4_addr(&sin, f), + SockAddr::IpV4(sin) => print_ipv4_addr(&sin, f), _ => unimplemented!() } } @@ -249,12 +244,10 @@ fn sendto_sockaddr(sockfd: Fd, buf: &[u8], flags: SockMessageFlags, addr: &T) } pub fn sendto(sockfd: Fd, buf: &[u8], addr: &SockAddr, flags: SockMessageFlags) -> NixResult { - use self::addr::SockAddr::*; - let ret = match *addr { - SockIpV4(ref addr) => sendto_sockaddr(sockfd, buf, flags, addr), - SockIpV6(ref addr) => sendto_sockaddr(sockfd, buf, flags, addr), - SockUnix(ref addr) => sendto_sockaddr(sockfd, buf, flags, addr), + SockAddr::IpV4(ref addr) => sendto_sockaddr(sockfd, buf, flags, addr), + SockAddr::IpV6(ref addr) => sendto_sockaddr(sockfd, buf, flags, addr), + SockAddr::Unix(ref addr) => sendto_sockaddr(sockfd, buf, flags, addr), }; if ret < 0 { @@ -314,12 +307,10 @@ fn getpeername_sockaddr(sockfd: Fd, addr: &T) -> NixResult { } pub fn getpeername(sockfd: Fd, addr: &mut SockAddr) -> NixResult { - use self::addr::SockAddr::*; - match *addr { - SockIpV4(ref addr) => getpeername_sockaddr(sockfd, addr), - SockIpV6(ref addr) => getpeername_sockaddr(sockfd, addr), - SockUnix(ref addr) => getpeername_sockaddr(sockfd, addr) + SockAddr::IpV4(ref addr) => getpeername_sockaddr(sockfd, addr), + SockAddr::IpV6(ref addr) => getpeername_sockaddr(sockfd, addr), + SockAddr::Unix(ref addr) => getpeername_sockaddr(sockfd, addr) } } @@ -336,11 +327,9 @@ fn getsockname_sockaddr(sockfd: Fd, addr: &T) -> NixResult { } pub fn getsockname(sockfd: Fd, addr: &mut SockAddr) -> NixResult { - use self::addr::SockAddr::*; - match *addr { - SockIpV4(ref addr) => getsockname_sockaddr(sockfd, addr), - SockIpV6(ref addr) => getsockname_sockaddr(sockfd, addr), - SockUnix(ref addr) => getsockname_sockaddr(sockfd, addr) + SockAddr::IpV4(ref addr) => getsockname_sockaddr(sockfd, addr), + SockAddr::IpV6(ref addr) => getsockname_sockaddr(sockfd, addr), + SockAddr::Unix(ref addr) => getsockname_sockaddr(sockfd, addr) } } -- cgit v1.2.3