Skip to content

Commit 88988a3

Browse files
carllerchecarllerche
committed
Remove prefix from SockAddr variants
1 parent 4059820 commit 88988a3

File tree

3 files changed

+29
-40
lines changed

3 files changed

+29
-40
lines changed

‎src/sys/socket/addr.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ use std::os::unix::OsStrExt;
99
#[derive(Copy)]
1010
pub enum SockAddr {
1111
// TODO: Rename these variants IpV4, IpV6, Unix
12-
SockIpV4(sockaddr_in),
13-
SockIpV6(sockaddr_in6),
14-
SockUnix(sockaddr_un)
12+
IpV4(sockaddr_in),
13+
IpV6(sockaddr_in6),
14+
Unix(sockaddr_un)
1515
}
1616

1717
/// A trait for values which can be converted or resolved to a SockAddr.
@@ -40,7 +40,7 @@ impl ToSockAddr for path::Path {
4040
fn to_sock_addr(&self) -> NixResult<SockAddr> {
4141
let bytes = self.as_os_str().as_bytes();
4242

43-
Ok(SockAddr::SockUnix(unsafe {
43+
Ok(SockAddr::Unix(unsafe {
4444
let mut ret = sockaddr_un {
4545
sun_family: AF_UNIX as sa_family_t,
4646
.. mem::zeroed()
@@ -71,7 +71,7 @@ impl ToSockAddr for net::SocketAddr {
7171
match self.ip() {
7272
IpAddr::V4(ip) => {
7373
let addr = ip.octets();
74-
Ok(SockAddr::SockIpV4(sockaddr_in {
74+
Ok(SockAddr::IpV4(sockaddr_in {
7575
sin_family: AF_INET as sa_family_t,
7676
sin_port: self.port(),
7777
sin_addr: in_addr {
@@ -100,7 +100,7 @@ impl FromSockAddr for net::SocketAddr {
100100
use std::num::Int;
101101

102102
match *addr {
103-
SockAddr::SockIpV4(ref addr) => {
103+
SockAddr::IpV4(ref addr) => {
104104
let ip = Int::from_be(addr.sin_addr.s_addr);
105105
let ip = Ipv4Addr::new(
106106
((ip >> 24) as u8) & 0xff,
@@ -110,15 +110,15 @@ impl FromSockAddr for net::SocketAddr {
110110

111111
Some(net::SocketAddr::new(IpAddr::V4(ip), addr.sin_port))
112112
}
113-
SockAddr::SockIpV6(_) => unimplemented!(),
113+
SockAddr::IpV6(_) => unimplemented!(),
114114
_ => None,
115115
}
116116
}
117117
}
118118

119119
impl FromSockAddr for path::PathBuf {
120120
fn from_sock_addr(addr: &SockAddr) -> Option<path::PathBuf> {
121-
if let SockAddr::SockUnix(ref addr) = *addr {
121+
if let SockAddr::Unix(ref addr) = *addr {
122122
unsafe {
123123
let bytes = CStr::from_ptr(addr.sun_path.as_ptr()).to_bytes();
124124
let osstr = <OsStr as OsStrExt>::from_bytes(bytes);

‎src/sys/socket/mod.rs

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,12 @@ pub fn listen(sockfd: Fd, backlog: usize) -> NixResult<()> {
7575
}
7676

7777
pub fn bind<A: ToSockAddr>(sockfd: Fd, addr: &A) -> NixResult<()> {
78-
use self::addr::SockAddr::*;
79-
8078
let res = unsafe {
8179
try!(addr.with_sock_addr(|addr| {
8280
match *addr {
83-
SockIpV4(ref addr) => ffi::bind(sockfd, mem::transmute(addr), mem::size_of::<sockaddr_in>() as socklen_t),
84-
SockIpV6(ref addr) => ffi::bind(sockfd, mem::transmute(addr), mem::size_of::<sockaddr_in6>() as socklen_t),
85-
SockUnix(ref addr) => ffi::bind(sockfd, mem::transmute(addr), mem::size_of::<sockaddr_un>() as socklen_t)
81+
SockAddr::IpV4(ref addr) => ffi::bind(sockfd, mem::transmute(addr), mem::size_of::<sockaddr_in>() as socklen_t),
82+
SockAddr::IpV6(ref addr) => ffi::bind(sockfd, mem::transmute(addr), mem::size_of::<sockaddr_in6>() as socklen_t),
83+
SockAddr::Unix(ref addr) => ffi::bind(sockfd, mem::transmute(addr), mem::size_of::<sockaddr_un>() as socklen_t)
8684
}
8785
}))
8886
};
@@ -152,14 +150,12 @@ fn accept4_polyfill(sockfd: Fd, flags: SockFlag) -> NixResult<Fd> {
152150
}
153151

154152
pub fn connect<A: ToSockAddr>(sockfd: Fd, addr: &A) -> NixResult<()> {
155-
use self::addr::SockAddr::*;
156-
157153
let res = unsafe {
158154
try!(addr.with_sock_addr(|addr| {
159155
match *addr {
160-
SockIpV4(ref addr) => ffi::connect(sockfd, mem::transmute(addr), mem::size_of::<sockaddr_in>() as socklen_t),
161-
SockIpV6(ref addr) => ffi::connect(sockfd, mem::transmute(addr), mem::size_of::<sockaddr_in6>() as socklen_t),
162-
SockUnix(ref addr) => ffi::connect(sockfd, mem::transmute(addr), mem::size_of::<sockaddr_un>() as socklen_t)
156+
SockAddr::IpV4(ref addr) => ffi::connect(sockfd, mem::transmute(addr), mem::size_of::<sockaddr_in>() as socklen_t),
157+
SockAddr::IpV6(ref addr) => ffi::connect(sockfd, mem::transmute(addr), mem::size_of::<sockaddr_in6>() as socklen_t),
158+
SockAddr::Unix(ref addr) => ffi::connect(sockfd, mem::transmute(addr), mem::size_of::<sockaddr_un>() as socklen_t)
163159
}
164160
}))
165161
};
@@ -171,21 +167,20 @@ mod sa_helpers {
171167
use std::mem;
172168
use libc::{sockaddr_storage, sockaddr_in, sockaddr_in6, sockaddr_un};
173169
use super::SockAddr;
174-
use super::SockAddr::*;
175170

176171
pub fn to_sockaddr_ipv4(addr: &sockaddr_storage) -> SockAddr {
177172
let sin : &sockaddr_in = unsafe { mem::transmute(addr) };
178-
SockIpV4( *sin )
173+
SockAddr::IpV4( *sin )
179174
}
180175

181176
pub fn to_sockaddr_ipv6(addr: &sockaddr_storage) -> SockAddr {
182177
let sin6 : &sockaddr_in6 = unsafe { mem::transmute(addr) };
183-
SockIpV6( *sin6 )
178+
SockAddr::IpV6( *sin6 )
184179
}
185180

186181
pub fn to_sockaddr_unix(addr: &sockaddr_storage) -> SockAddr {
187182
let sun : &sockaddr_un = unsafe { mem::transmute(addr) };
188-
SockUnix( *sun )
183+
SockAddr::Unix( *sun )
189184
}
190185
}
191186

@@ -228,7 +223,7 @@ fn print_ipv4_addr(sin: &sockaddr_in, f: &mut fmt::Formatter) -> fmt::Result {
228223
impl fmt::Debug for SockAddr {
229224
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
230225
match *self {
231-
SockAddr::SockIpV4(sin) => print_ipv4_addr(&sin, f),
226+
SockAddr::IpV4(sin) => print_ipv4_addr(&sin, f),
232227
_ => unimplemented!()
233228
}
234229
}
@@ -249,12 +244,10 @@ fn sendto_sockaddr<T>(sockfd: Fd, buf: &[u8], flags: SockMessageFlags, addr: &T)
249244
}
250245

251246
pub fn sendto(sockfd: Fd, buf: &[u8], addr: &SockAddr, flags: SockMessageFlags) -> NixResult<usize> {
252-
use self::addr::SockAddr::*;
253-
254247
let ret = match *addr {
255-
SockIpV4(ref addr) => sendto_sockaddr(sockfd, buf, flags, addr),
256-
SockIpV6(ref addr) => sendto_sockaddr(sockfd, buf, flags, addr),
257-
SockUnix(ref addr) => sendto_sockaddr(sockfd, buf, flags, addr),
248+
SockAddr::IpV4(ref addr) => sendto_sockaddr(sockfd, buf, flags, addr),
249+
SockAddr::IpV6(ref addr) => sendto_sockaddr(sockfd, buf, flags, addr),
250+
SockAddr::Unix(ref addr) => sendto_sockaddr(sockfd, buf, flags, addr),
258251
};
259252

260253
if ret < 0 {
@@ -314,12 +307,10 @@ fn getpeername_sockaddr<T>(sockfd: Fd, addr: &T) -> NixResult<bool> {
314307
}
315308

316309
pub fn getpeername(sockfd: Fd, addr: &mut SockAddr) -> NixResult<bool> {
317-
use self::addr::SockAddr::*;
318-
319310
match *addr {
320-
SockIpV4(ref addr) => getpeername_sockaddr(sockfd, addr),
321-
SockIpV6(ref addr) => getpeername_sockaddr(sockfd, addr),
322-
SockUnix(ref addr) => getpeername_sockaddr(sockfd, addr)
311+
SockAddr::IpV4(ref addr) => getpeername_sockaddr(sockfd, addr),
312+
SockAddr::IpV6(ref addr) => getpeername_sockaddr(sockfd, addr),
313+
SockAddr::Unix(ref addr) => getpeername_sockaddr(sockfd, addr)
323314
}
324315
}
325316

@@ -336,11 +327,9 @@ fn getsockname_sockaddr<T>(sockfd: Fd, addr: &T) -> NixResult<bool> {
336327
}
337328

338329
pub fn getsockname(sockfd: Fd, addr: &mut SockAddr) -> NixResult<bool> {
339-
use self::addr::SockAddr::*;
340-
341330
match *addr {
342-
SockIpV4(ref addr) => getsockname_sockaddr(sockfd, addr),
343-
SockIpV6(ref addr) => getsockname_sockaddr(sockfd, addr),
344-
SockUnix(ref addr) => getsockname_sockaddr(sockfd, addr)
331+
SockAddr::IpV4(ref addr) => getsockname_sockaddr(sockfd, addr),
332+
SockAddr::IpV6(ref addr) => getsockname_sockaddr(sockfd, addr),
333+
SockAddr::Unix(ref addr) => getsockname_sockaddr(sockfd, addr)
345334
}
346335
}

‎test/sys/test_socket.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub fn test_inetv4_addr_to_sock_addr() {
1010
let addr = actual.to_sock_addr().unwrap();
1111

1212
match addr {
13-
SockAddr::SockIpV4(addr) => {
13+
SockAddr::IpV4(addr) => {
1414
assert_eq!(addr.sin_addr.s_addr, Int::from_be(2130706433));
1515
assert_eq!(addr.sin_port, 3000);
1616
}
@@ -27,7 +27,7 @@ pub fn test_path_to_sock_addr() {
2727
let addr = actual.to_sock_addr().unwrap();
2828

2929
match addr {
30-
SockAddr::SockUnix(addr) => {
30+
SockAddr::Unix(addr) => {
3131
let expect: &'static [i8] = unsafe { mem::transmute(b"/foo/bar") };
3232
assert_eq!(&addr.sun_path[..8], expect);
3333
}

0 commit comments

Comments
 (0)