haiku: enable socket

Author: Al Hoang

src/sys/mod.rs

@@ -126,7 +126,7 @@ feature! {
     pub mod signalfd;
 }
 
-#[cfg(not(any(target_os = "redox", target_os = "haiku")))]
+#[cfg(not(any(target_os = "redox")))]
 feature! {
     #![feature = "socket"]
     #[allow(missing_docs)]

src/sys/socket/addr.rs

@@ -26,6 +26,7 @@ use crate::sys::socket::addr::sys_control::SysControlAddr;
           target_os = "illumos",
           target_os = "netbsd",
           target_os = "openbsd",
+          target_os = "haiku",
           target_os = "fuchsia"))]
 #[cfg(feature = "net")]
 pub use self::datalink::LinkAddr;
@@ -120,6 +121,7 @@ pub enum AddressFamily {
     #[cfg_attr(docsrs, doc(cfg(all())))]
     Rose = libc::AF_ROSE,
     /// DECet protocol sockets.
+    #[cfg(not(any(target_os = "haiku")))]
     Decnet = libc::AF_DECnet,
     /// Reserved for "802.2LLC project"; never used.
     #[cfg(any(target_os = "android", target_os = "linux"))]
@@ -151,6 +153,7 @@ pub enum AddressFamily {
     #[cfg_attr(docsrs, doc(cfg(all())))]
     Rds = libc::AF_RDS,
     /// IBM SNA
+    #[cfg(not(any(target_os = "haiku")))]
     Sna = libc::AF_SNA,
     /// Socket interface over IrDA
     #[cfg(any(target_os = "android", target_os = "linux"))]
@@ -202,7 +205,7 @@ pub enum AddressFamily {
     #[cfg_attr(docsrs, doc(cfg(all())))]
     RxRpc = libc::AF_RXRPC,
     /// New "modular ISDN" driver interface protocol
-    #[cfg(not(any(target_os = "illumos", target_os = "solaris")))]
+    #[cfg(not(any(target_os = "illumos", target_os = "solaris", target_os = "haiku")))]
     #[cfg_attr(docsrs, doc(cfg(all())))]
     Isdn = libc::AF_ISDN,
     /// Nokia cellular modem IPC/RPC interface
@@ -1158,6 +1161,7 @@ impl SockaddrIn {
                   target_os = "ios",
                   target_os = "macos",
                   target_os = "netbsd",
+                  target_os = "haiku",
                   target_os = "openbsd"))]
             sin_len: Self::size() as u8,
             sin_family: AddressFamily::Inet as sa_family_t,
@@ -1420,6 +1424,7 @@ impl SockaddrLike for SockaddrStorage {
                           target_os = "macos",
                           target_os = "illumos",
                           target_os = "netbsd",
+                          target_os = "haiku",
                           target_os = "openbsd"))]
                 #[cfg(feature = "net")]
                 libc::AF_LINK => LinkAddr::from_raw(addr, l)
@@ -1504,6 +1509,7 @@ impl SockaddrStorage {
         as_sockaddr_in, as_sockaddr_in_mut, SockaddrIn,
         AddressFamily::Inet, libc::sockaddr_in, sin}
 
+    #[cfg(not(any(target_os = "haiku")))]
     #[cfg(feature = "net")]
     accessors!{
         as_sockaddr_in6, as_sockaddr_in6_mut, SockaddrIn6,
@@ -2389,6 +2395,7 @@ mod datalink {
           target_os = "macos",
           target_os = "illumos",
           target_os = "netbsd",
+          target_os = "haiku",
           target_os = "openbsd"))]
 #[cfg_attr(docsrs, doc(cfg(all())))]
 mod datalink {
@@ -2403,11 +2410,13 @@ mod datalink {
 
     impl LinkAddr {
         /// interface index, if != 0, system given index for interface
+        #[cfg(not(any(target_os = "haiku")))]
         pub fn ifindex(&self) -> usize {
             self.0.sdl_index as usize
         }
 
         /// Datalink type
+        #[cfg(not(any(target_os = "haiku")))]
         pub fn datalink_type(&self) -> u8 {
             self.0.sdl_type
         }
@@ -2423,6 +2432,7 @@ mod datalink {
         }
 
         /// link layer selector length
+        #[cfg(not(any(target_os = "haiku")))]
         pub fn slen(&self) -> usize {
             self.0.sdl_slen as usize
         }
@@ -2715,7 +2725,8 @@ mod tests {
                       target_os = "macos",
                       target_os = "netbsd",
                       target_os = "illumos",
-                      target_os = "openbsd"))]
+                      target_os = "openbsd",
+                      target_os = "haiku"))]
             let l = mem::size_of::<libc::sockaddr_dl>();
             #[cfg(any(
                     target_os = "android",

src/sys/socket/mod.rs

@@ -57,7 +57,7 @@ pub use self::addr::{
     UnixAddr,
 };
 #[allow(deprecated)]
-#[cfg(any(target_os = "illumos", target_os = "solaris"))]
+#[cfg(any(target_os = "illumos", target_os = "solaris", target_os = "haiku"))]
 #[cfg(feature = "net")]
 pub use self::addr::{
     InetAddr,
@@ -118,6 +118,7 @@ pub enum SockType {
     Raw = libc::SOCK_RAW,
     /// Provides a reliable datagram layer that does not
     /// guarantee ordering.
+    #[cfg(not(any(target_os = "haiku")))]
     Rdm = libc::SOCK_RDM,
 }
 
@@ -328,7 +329,6 @@ libc_bitflags!{
         #[cfg(any(target_os = "android",
                   target_os = "dragonfly",
                   target_os = "freebsd",
-                  target_os = "haiku",
                   target_os = "linux",
                   target_os = "netbsd",
                   target_os = "openbsd"))]
@@ -846,6 +846,7 @@ impl ControlMessageOwned {
                 let cred: libc::cmsgcred = ptr::read_unaligned(p as *const _);
                 ControlMessageOwned::ScmCreds(cred.into())
             }
+            #[cfg(not(any(target_os = "haiku")))]
             (libc::SOL_SOCKET, libc::SCM_TIMESTAMP) => {
                 let tv: libc::timeval = ptr::read_unaligned(p as *const _);
                 ControlMessageOwned::ScmTimestamp(TimeVal::from(tv))

src/sys/socket/sockopt.rs

@@ -396,7 +396,7 @@ cfg_if! {
             TcpMaxSeg, GetOnly, libc::IPPROTO_TCP, libc::TCP_MAXSEG, u32);
     }
 }
-#[cfg(not(target_os = "openbsd"))]
+#[cfg(not(any(target_os = "openbsd", target_os = "haiku")))]
 #[cfg(feature = "net")]
 sockopt_impl!(
     #[cfg_attr(docsrs, doc(cfg(feature = "net")))]
@@ -410,7 +410,7 @@ sockopt_impl!(
     #[allow(missing_docs)]
     // Not documented by Linux!
     TcpRepair, Both, libc::IPPROTO_TCP, libc::TCP_REPAIR, u32);
-#[cfg(not(target_os = "openbsd"))]
+#[cfg(not(any(target_os = "openbsd", target_os = "haiku")))]
 #[cfg(feature = "net")]
 sockopt_impl!(
     #[cfg_attr(docsrs, doc(cfg(feature = "net")))]
@@ -470,6 +470,7 @@ sockopt_impl!(
     /// Specifies exact type of timestamping information collected by the kernel
     /// [Further reading](https://www.kernel.org/doc/html/latest/networking/timestamping.html)
     Timestamping, Both, libc::SOL_SOCKET, libc::SO_TIMESTAMPING, super::TimestampingFlag);
+#[cfg(not(any(target_os = "haiku")))]
 sockopt_impl!(
     /// Enable or disable the receiving of the `SO_TIMESTAMP` control message.
     ReceiveTimestamp, Both, libc::SOL_SOCKET, libc::SO_TIMESTAMP, bool);

test/sys/mod.rs

@@ -17,7 +17,7 @@ mod test_mman;
 mod test_signalfd;
 #[cfg(not(any(target_os = "redox", target_os = "haiku")))]
 mod test_socket;
-#[cfg(not(any(target_os = "redox", target_os = "haiku")))]
+#[cfg(not(any(target_os = "redox")))]
 mod test_sockopt;
 #[cfg(not(target_os = "redox"))]
 mod test_select;