Skip to content

Commit

Permalink
Remove special casing for Redox as it is supported by unix target family
Browse files Browse the repository at this point in the history
  • Loading branch information
@jackpot51
jackpot51 committed Oct 17, 2022
1 parent a183475 commit eb44275
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 232 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ include = [
[target."cfg(windows)".dependencies]
winapi = { version = "0.3", features = ["handleapi", "winsock2", "ws2def", "ws2ipdef", "ws2tcpip"] }

[target.'cfg(any(target_os="redox", unix, target_os="wasi"))'.dependencies]
[target.'cfg(any(unix, target_os="wasi"))'.dependencies]
libc = "0.2.54"

[dependencies]
Expand Down
113 changes: 9 additions & 104 deletions src/ext.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,9 @@ cfg_if! {

use std::time::Duration;

#[cfg(any(unix, target_os = "redox", target_os = "wasi"))] use libc::*;
#[cfg(any(unix, target_os = "redox"))] use std::os::unix::prelude::*;
#[cfg(any(unix, target_os = "wasi"))] use libc::*;
#[cfg(any(unix))] use std::os::unix::prelude::*;
#[cfg(target_os = "wasi")] use std::os::wasi::prelude::*;
#[cfg(target_os = "redox")] pub type Socket = usize;
#[cfg(unix)] pub type Socket = c_int;
#[cfg(target_os = "wasi")] pub type Socket = std::os::wasi::io::RawFd;
#[cfg(windows)] pub type Socket = SOCKET;
Expand All @@ -59,7 +58,7 @@ struct tcp_keepalive {
keepaliveinterval: c_ulong,
}

#[cfg(any(unix, target_os = "redox", target_os = "wasi"))] fn v(opt: c_int) -> c_int { opt }
#[cfg(any(unix, target_os = "wasi"))] fn v(opt: c_int) -> c_int { opt }
#[cfg(windows)] fn v(opt: IPPROTO) -> c_int { opt as c_int }

#[cfg(target_os = "wasi")]
Expand All @@ -73,8 +72,6 @@ pub fn set_opt<T: Copy>(sock: Socket, opt: c_int, val: c_int,
payload: T) -> io::Result<()> {
unsafe {
let payload = &payload as *const T as *const c_void;
#[cfg(target_os = "redox")]
let sock = sock as c_int;
try!(::cvt(setsockopt(sock, opt, val, payload as *const _,
mem::size_of::<T>() as socklen_t)));
}
Expand All @@ -90,8 +87,6 @@ pub fn get_opt<T: Copy>(sock: Socket, opt: c_int, val: c_int) -> io::Result<T> {
unsafe {
let mut slot: T = mem::zeroed();
let mut len = mem::size_of::<T>() as socklen_t;
#[cfg(target_os = "redox")]
let sock = sock as c_int;
try!(::cvt(getsockopt(sock, opt, val,
&mut slot as *mut _ as *mut _,
&mut len)));
Expand Down Expand Up @@ -656,7 +651,7 @@ pub trait AsSock {
fn as_sock(&self) -> Socket;
}

#[cfg(any(unix, target_os = "redox", target_os = "wasi"))]
#[cfg(any(unix, target_os = "wasi"))]
impl<T: AsRawFd> AsSock for T {
fn as_sock(&self) -> Socket { self.as_raw_fd() }
}
Expand All @@ -672,8 +667,6 @@ cfg_if! {
use libc::SO_KEEPALIVE as KEEPALIVE_OPTION;
} else if #[cfg(unix)] {
use libc::TCP_KEEPIDLE as KEEPALIVE_OPTION;
} else if #[cfg(target_os = "redox")] {
use libc::TCP_KEEPIDLE as KEEPALIVE_OPTION;
} else {
// ...
}
Expand Down Expand Up @@ -715,29 +708,6 @@ impl TcpStreamExt for TcpStream {
self.keepalive_ms().map(|o| o.map(ms2dur))
}

#[cfg(target_os = "redox")]
fn set_keepalive_ms(&self, keepalive: Option<u32>) -> io::Result<()> {
try!(set_opt(self.as_sock(), SOL_SOCKET, SO_KEEPALIVE,
keepalive.is_some() as c_int));
if let Some(dur) = keepalive {
try!(set_opt(self.as_sock(), v(IPPROTO_TCP), KEEPALIVE_OPTION,
(dur / 1000) as c_int));
}
Ok(())
}

#[cfg(target_os = "redox")]
fn keepalive_ms(&self) -> io::Result<Option<u32>> {
let keepalive = try!(get_opt::<c_int>(self.as_sock(), SOL_SOCKET,
SO_KEEPALIVE));
if keepalive == 0 {
return Ok(None)
}
let secs = try!(get_opt::<c_int>(self.as_sock(), v(IPPROTO_TCP),
KEEPALIVE_OPTION));
Ok(Some((secs as u32) * 1000))
}

#[cfg(unix)]
fn set_keepalive_ms(&self, keepalive: Option<u32>) -> io::Result<()> {
try!(set_opt(self.as_sock(), SOL_SOCKET, SO_KEEPALIVE,
Expand Down Expand Up @@ -893,7 +863,7 @@ impl TcpStreamExt for TcpStream {
}
}

#[cfg(any(target_os = "redox", unix, target_os = "wasi"))]
#[cfg(any(unix, target_os = "wasi"))]
fn ms2timeout(dur: Option<u32>) -> timeval {
// TODO: be more rigorous
match dur {
Expand All @@ -905,7 +875,7 @@ fn ms2timeout(dur: Option<u32>) -> timeval {
}
}

#[cfg(any(target_os = "redox", unix, target_os = "wasi"))]
#[cfg(any(unix, target_os = "wasi"))]
fn timeout2ms(dur: timeval) -> Option<u32> {
if dur.tv_sec == 0 && dur.tv_usec == 0 {
None
Expand Down Expand Up @@ -950,7 +920,7 @@ fn dur2linger(dur: Option<Duration>) -> linger {
}
}

#[cfg(any(target_os = "redox", unix, target_os = "wasi"))]
#[cfg(any(unix, target_os = "wasi"))]
fn dur2linger(dur: Option<Duration>) -> linger {
match dur {
Some(d) => {
Expand Down Expand Up @@ -1027,24 +997,18 @@ impl UdpSocketExt for UdpSocket {
set_opt(self.as_sock(), IPPROTO_IP, IP_MULTICAST_TTL,
multicast_ttl_v4 as c_int)
}

fn multicast_ttl_v4(&self) -> io::Result<u32> {
get_opt::<c_int>(self.as_sock(), IPPROTO_IP, IP_MULTICAST_TTL)
.map(|b| b as u32)
}

fn set_multicast_hops_v6(&self, _hops: u32) -> io::Result<()> {
#[cfg(target_os = "redox")]
return Err(io::Error::new(io::ErrorKind::Other, "Not implemented yet"));
#[cfg(not(target_os = "redox"))]
set_opt(self.as_sock(), v(IPPROTO_IPV6), IPV6_MULTICAST_HOPS,
_hops as c_int)
}

fn multicast_hops_v6(&self) -> io::Result<u32> {
#[cfg(target_os = "redox")]
return Err(io::Error::new(io::ErrorKind::Other, "Not implemented yet"));
#[cfg(not(target_os = "redox"))]
get_opt::<c_int>(self.as_sock(), v(IPPROTO_IPV6), IPV6_MULTICAST_HOPS)
.map(|b| b as u32)
}
Expand All @@ -1059,30 +1023,18 @@ impl UdpSocketExt for UdpSocket {
}

fn set_multicast_if_v4(&self, _interface: &Ipv4Addr) -> io::Result<()> {
#[cfg(target_os = "redox")]
return Err(io::Error::new(io::ErrorKind::Other, "Not implemented yet"));
#[cfg(not(target_os = "redox"))]
set_opt(self.as_sock(), IPPROTO_IP, IP_MULTICAST_IF, ip2in_addr(_interface))
}

fn multicast_if_v4(&self) -> io::Result<Ipv4Addr> {
#[cfg(target_os = "redox")]
return Err(io::Error::new(io::ErrorKind::Other, "Not implemented yet"));
#[cfg(not(target_os = "redox"))]
get_opt(self.as_sock(), IPPROTO_IP, IP_MULTICAST_IF).map(in_addr2ip)
}

fn set_multicast_if_v6(&self, _interface: u32) -> io::Result<()> {
#[cfg(target_os = "redox")]
return Err(io::Error::new(io::ErrorKind::Other, "Not implemented yet"));
#[cfg(not(target_os = "redox"))]
set_opt(self.as_sock(), v(IPPROTO_IPV6), IPV6_MULTICAST_IF, to_ipv6mr_interface(_interface))
}

fn multicast_if_v6(&self) -> io::Result<u32> {
#[cfg(target_os = "redox")]
return Err(io::Error::new(io::ErrorKind::Other, "Not implemented yet"));
#[cfg(not(target_os = "redox"))]
get_opt::<c_int>(self.as_sock(), v(IPPROTO_IPV6), IPV6_MULTICAST_IF).map(|b| b as u32)
}

Expand All @@ -1096,16 +1048,10 @@ impl UdpSocketExt for UdpSocket {
}

fn set_unicast_hops_v6(&self, _ttl: u32) -> io::Result<()> {
#[cfg(target_os = "redox")]
return Err(io::Error::new(io::ErrorKind::Other, "Not implemented yet"));
#[cfg(not(target_os = "redox"))]
set_opt(self.as_sock(), v(IPPROTO_IPV6), IPV6_UNICAST_HOPS, _ttl as c_int)
}

fn unicast_hops_v6(&self) -> io::Result<u32> {
#[cfg(target_os = "redox")]
return Err(io::Error::new(io::ErrorKind::Other, "Not implemented yet"));
#[cfg(not(target_os = "redox"))]
get_opt::<c_int>(self.as_sock(), IPPROTO_IP, IPV6_UNICAST_HOPS)
.map(|b| b as u32)
}
Expand Down Expand Up @@ -1200,13 +1146,6 @@ impl UdpSocketExt for UdpSocket {
do_connect(self.as_sock(), addr)
}

#[cfg(target_os = "redox")]
fn send(&self, buf: &[u8]) -> io::Result<usize> {
unsafe {
::cvt(write(self.as_sock() as c_int, buf.as_ptr() as *const _, buf.len())).map(|n| n as usize)
}
}

#[cfg(unix)]
fn send(&self, buf: &[u8]) -> io::Result<usize> {
unsafe {
Expand Down Expand Up @@ -1240,14 +1179,6 @@ impl UdpSocketExt for UdpSocket {
}
}

#[cfg(target_os = "redox")]
fn recv(&self, buf: &mut [u8]) -> io::Result<usize> {
unsafe {
::cvt(read(self.as_sock() as c_int, buf.as_mut_ptr() as *mut _, buf.len()))
.map(|n| n as usize)
}
}

#[cfg(unix)]
fn recv(&self, buf: &mut [u8]) -> io::Result<usize> {
unsafe {
Expand Down Expand Up @@ -1302,21 +1233,6 @@ fn do_connect<A: ToSocketAddrs>(sock: Socket, addr: A) -> io::Result<()> {
return ret
}

#[cfg(target_os = "redox")]
fn set_nonblocking(sock: Socket, nonblocking: bool) -> io::Result<()> {
let mut flags = ::cvt(unsafe {
fcntl(sock as c_int, F_GETFL)
})?;
if nonblocking {
flags |= O_NONBLOCK;
} else {
flags &= !O_NONBLOCK;
}
::cvt(unsafe {
fcntl(sock as c_int, F_SETFL, flags)
}).and(Ok(()))
}

#[cfg(unix)]
fn set_nonblocking(sock: Socket, nonblocking: bool) -> io::Result<()> {
let mut nonblocking = nonblocking as c_ulong;
Expand All @@ -1338,17 +1254,6 @@ fn set_nonblocking(sock: Socket, nonblocking: bool) -> io::Result<()> {
}).map(|_| ())
}

#[cfg(target_os = "redox")]
fn ip2in_addr(ip: &Ipv4Addr) -> in_addr {
let oct = ip.octets();
in_addr {
s_addr: ::hton(((oct[0] as u32) << 24) |
((oct[1] as u32) << 16) |
((oct[2] as u32) << 8) |
((oct[3] as u32) << 0)),
}
}

#[cfg(any(unix, target_os = "wasi"))]
fn ip2in_addr(ip: &Ipv4Addr) -> in_addr {
let oct = ip.octets();
Expand Down Expand Up @@ -1377,7 +1282,7 @@ fn ip2in_addr(ip: &Ipv4Addr) -> in_addr {

fn in_addr2ip(ip: &in_addr) -> Ipv4Addr {
let h_addr = c::in_addr_to_u32(ip);

let a: u8 = (h_addr >> 24) as u8;
let b: u8 = (h_addr >> 16) as u8;
let c: u8 = (h_addr >> 8) as u8;
Expand Down
3 changes: 1 addition & 2 deletions src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

#![cfg_attr(target_os = "wasi", feature(wasi_ext))]

#[cfg(any(target_os = "redox", target_os = "wasi", unix))] extern crate libc;
#[cfg(any(target_os = "wasi", unix))] extern crate libc;

#[cfg(windows)] extern crate winapi;

Expand All @@ -64,7 +64,6 @@ mod socket;
mod ext;
mod utils;

#[cfg(target_os="redox")] #[path = "sys/redox/mod.rs"] mod sys;
#[cfg(unix)] #[path = "sys/unix/mod.rs"] mod sys;
#[cfg(windows)] #[path = "sys/windows/mod.rs"] mod sys;
#[cfg(target_os = "wasi")] #[path = "sys/wasi/mod.rs"] mod sys;
Expand Down
2 changes: 1 addition & 1 deletion src/socket.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use std::fmt;
use std::io;
use std::mem;
use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
#[cfg(any(unix, target_os = "redox", target_os = "wasi"))]
#[cfg(any(unix, target_os = "wasi"))]
use libc::c_int;
#[cfg(windows)]
use winapi::ctypes::c_int;
Expand Down
43 changes: 0 additions & 43 deletions src/sys/redox/impls.rs
View file

This file was deleted.

Loading

0 comments on commit eb44275

Please sign in to comment.