diff options
Diffstat (limited to 'src/libnative')
| -rw-r--r-- | src/libnative/io/c_unix.rs | 49 | ||||
| -rw-r--r-- | src/libnative/io/net.rs | 19 |
2 files changed, 56 insertions, 12 deletions
diff --git a/src/libnative/io/c_unix.rs b/src/libnative/io/c_unix.rs index 767090a10cd..e6cb5cb76f1 100644 --- a/src/libnative/io/c_unix.rs +++ b/src/libnative/io/c_unix.rs @@ -22,15 +22,20 @@ use libc; #[cfg(target_os = "macos")] #[cfg(target_os = "freebsd")] pub static FIONBIO: libc::c_ulong = 0x8004667e; -#[cfg(target_os = "linux")] +#[cfg(target_os = "linux", not(target_arch = "mips"))] #[cfg(target_os = "android")] pub static FIONBIO: libc::c_ulong = 0x5421; +#[cfg(target_os = "linux", target_arch = "mips")] +pub static FIONBIO: libc::c_ulong = 0x667e; + #[cfg(target_os = "macos")] #[cfg(target_os = "freebsd")] pub static FIOCLEX: libc::c_ulong = 0x20006601; -#[cfg(target_os = "linux")] +#[cfg(target_os = "linux", not(target_arch = "mips"))] #[cfg(target_os = "android")] pub static FIOCLEX: libc::c_ulong = 0x5451; +#[cfg(target_os = "linux", target_arch = "mips")] +pub static FIOCLEX: libc::c_ulong = 0x6601; #[cfg(target_os = "macos")] #[cfg(target_os = "freebsd")] @@ -100,7 +105,7 @@ mod select { } } -#[cfg(target_os = "linux")] +#[cfg(target_os = "linux", not(target_arch = "mips"))] #[cfg(target_os = "android")] mod signal { use libc; @@ -143,6 +148,44 @@ mod signal { } } +#[cfg(target_os = "linux", target_arch = "mips")] +mod signal { + use libc; + + pub static SA_NOCLDSTOP: libc::c_ulong = 0x00000001; + pub static SA_NOCLDWAIT: libc::c_ulong = 0x00010000; + pub static SA_NODEFER: libc::c_ulong = 0x40000000; + pub static SA_ONSTACK: libc::c_ulong = 0x08000000; + pub static SA_RESETHAND: libc::c_ulong = 0x80000000; + pub static SA_RESTART: libc::c_ulong = 0x10000000; + pub static SA_SIGINFO: libc::c_ulong = 0x00000008; + pub static SIGCHLD: libc::c_int = 18; + + // This definition is not as accurate as it could be, {pid, uid, status} is + // actually a giant union. Currently we're only interested in these fields, + // however. + pub struct siginfo { + si_signo: libc::c_int, + si_code: libc::c_int, + si_errno: libc::c_int, + pub pid: libc::pid_t, + pub uid: libc::uid_t, + pub status: libc::c_int, + } + + pub struct sigaction { + pub sa_flags: libc::c_uint, + pub sa_handler: extern fn(libc::c_int), + pub sa_mask: sigset_t, + sa_restorer: *mut libc::c_void, + sa_resv: [libc::c_int, ..1], + } + + pub struct sigset_t { + __val: [libc::c_ulong, ..32], + } +} + #[cfg(target_os = "macos")] #[cfg(target_os = "freebsd")] mod signal { diff --git a/src/libnative/io/net.rs b/src/libnative/io/net.rs index cacd38c2efd..26307feae91 100644 --- a/src/libnative/io/net.rs +++ b/src/libnative/io/net.rs @@ -42,11 +42,12 @@ enum InAddr { fn ip_to_inaddr(ip: ip::IpAddr) -> InAddr { match ip { ip::Ipv4Addr(a, b, c, d) => { + let ip = (a as u32 << 24) | + (b as u32 << 16) | + (c as u32 << 8) | + (d as u32 << 0); InAddr(libc::in_addr { - s_addr: (d as u32 << 24) | - (c as u32 << 16) | - (b as u32 << 8) | - (a as u32 << 0) + s_addr: mem::from_be32(ip) }) } ip::Ipv6Addr(a, b, c, d, e, f, g, h) => { @@ -174,11 +175,11 @@ pub fn sockaddr_to_addr(storage: &libc::sockaddr_storage, let storage: &libc::sockaddr_in = unsafe { mem::transmute(storage) }; - let addr = storage.sin_addr.s_addr as u32; - let a = (addr >> 0) as u8; - let b = (addr >> 8) as u8; - let c = (addr >> 16) as u8; - let d = (addr >> 24) as u8; + let ip = mem::to_be32(storage.sin_addr.s_addr as u32); + let a = (ip >> 24) as u8; + let b = (ip >> 16) as u8; + let c = (ip >> 8) as u8; + let d = (ip >> 0) as u8; Ok(ip::SocketAddr { ip: ip::Ipv4Addr(a, b, c, d), port: ntohs(storage.sin_port), |