NetBSD: Introduce if_.rs, fix the definition of ifreq

The definition of `struct ifreq` didn't match up. Make a new module for
`net/if.h` and fix it there. Note that this drops some trait
implementations since the correct API involves unions.

(backport <#4782>)
(cherry picked from commit 8cb1db9)

Author: tgross35

libc-test/build.rs

@@ -1490,6 +1490,7 @@ fn test_netbsd(target: &str) {
 
             // Anonymous unions
             ("ifconf", "ifc_ifcu") => true,
+            ("ifreq", "ifr_ifru") => true,
             ("utmpx", "ut_exit") => true,
             ("posix_spawn_file_actions_entry_t", "fae_data") => true,
 

src/new/mod.rs

@@ -183,6 +183,7 @@ cfg_if! {
     } else if #[cfg(target_vendor = "apple")] {
         pub use signal::*;
     } else if #[cfg(target_os = "netbsd")] {
+        pub use net::if_::*;
         pub use sys::ipc::*;
         pub use sys::statvfs::*;
         pub use sys::time::*;

src/new/netbsd/mod.rs

@@ -4,6 +4,10 @@
 //! * Sys headers: <https://github.com/NetBSD/src/tree/trunk/sys/sys>
 //! * Manual pages: <https://man.netbsd.org/>
 
+pub(crate) mod net {
+    pub(crate) mod if_;
+}
+
 pub(crate) mod sys;
 pub(crate) mod unistd;
 pub(crate) mod utmp_;

src/new/netbsd/net/if_.rs

@@ -0,0 +1,96 @@
+//! Header: `net/if.h`
+//!
+//! <https://github.com/NetBSD/src/tree/trunk/sys/timex.h>
+
+use crate::prelude::*;
+use crate::IFNAMSIZ;
+
+s! {
+    pub struct if_data {
+        pub ifi_type: c_uchar,
+        pub ifi_addrlen: c_uchar,
+        pub ifi_hdrlen: c_uchar,
+        pub ifi_link_state: c_int,
+        pub ifi_mtu: u64,
+        pub ifi_metric: u64,
+        pub ifi_baudrate: u64,
+        pub ifi_ipackets: u64,
+        pub ifi_ierrors: u64,
+        pub ifi_opackets: u64,
+        pub ifi_oerrors: u64,
+        pub ifi_collisions: u64,
+        pub ifi_ibytes: u64,
+        pub ifi_obytes: u64,
+        pub ifi_imcasts: u64,
+        pub ifi_omcasts: u64,
+        pub ifi_iqdrops: u64,
+        pub ifi_noproto: u64,
+        pub ifi_lastchange: crate::timespec,
+    }
+}
+
+pub const IFF_UP: c_int = 0x0001; // interface is up
+pub const IFF_BROADCAST: c_int = 0x0002; // broadcast address valid
+pub const IFF_DEBUG: c_int = 0x0004; // turn on debugging
+pub const IFF_LOOPBACK: c_int = 0x0008; // is a loopback net
+pub const IFF_POINTOPOINT: c_int = 0x0010; // interface is point-to-point link
+pub const IFF_RUNNING: c_int = 0x0040; // resources allocated
+pub const IFF_NOARP: c_int = 0x0080; // no address resolution protocol
+pub const IFF_PROMISC: c_int = 0x0100; // receive all packets
+pub const IFF_ALLMULTI: c_int = 0x0200; // receive all multicast packets
+pub const IFF_OACTIVE: c_int = 0x0400; // transmission in progress
+pub const IFF_SIMPLEX: c_int = 0x0800; // can't hear own transmissions
+pub const IFF_LINK0: c_int = 0x1000; // per link layer defined bit
+pub const IFF_LINK1: c_int = 0x2000; // per link layer defined bit
+pub const IFF_LINK2: c_int = 0x4000; // per link layer defined bit
+pub const IFF_MULTICAST: c_int = 0x8000; // supports multicast
+
+s! {
+    pub struct if_msghdr {
+        pub ifm_msglen: c_ushort,
+        pub ifm_version: c_uchar,
+        pub ifm_type: c_uchar,
+        pub ifm_addrs: c_int,
+        pub ifm_flags: c_int,
+        pub ifm_index: c_ushort,
+        pub ifm_data: if_data,
+    }
+}
+
+s_no_extra_traits! {
+    pub struct ifreq {
+        pub ifr_name: [c_char; IFNAMSIZ],
+        pub ifr_ifru: __c_anonymous_ifr_ifru,
+    }
+
+    pub union __c_anonymous_ifr_ifru {
+        pub ifru_addr: crate::sockaddr,
+        pub ifru_dstaddr: crate::sockaddr,
+        pub ifru_broadaddr: crate::sockaddr,
+        pub space: crate::sockaddr_storage,
+        pub ifru_flags: c_short,
+        pub ifru_addrflags: c_int,
+        pub ifru_metrics: c_int,
+        pub ifru_mtu: c_int,
+        pub ifru_dlt: c_int,
+        pub ifru_value: c_uint,
+        pub ifru_data: *mut c_void,
+        // buf and buflen are deprecated but they contribute to union size
+        ifru_b: __c_anonymous_ifr_ifru_ifru_b,
+    }
+
+    struct __c_anonymous_ifr_ifru_ifru_b {
+        b_buflen: u32,
+        b_buf: *mut c_void,
+    }
+
+    pub struct ifconf {
+        pub ifc_len: c_int,
+        pub ifc_ifcu: __c_anonymous_ifc_ifcu,
+    }
+
+    pub union __c_anonymous_ifc_ifcu {
+        pub ifcu_buf: *mut c_void,
+        pub ifcu_req: *mut ifreq,
+    }
+}

src/unix/bsd/netbsdlike/netbsd/mod.rs

@@ -342,38 +342,6 @@ s! {
         pub int_n_sign_posn: c_char,
     }
 
-    pub struct if_data {
-        pub ifi_type: c_uchar,
-        pub ifi_addrlen: c_uchar,
-        pub ifi_hdrlen: c_uchar,
-        pub ifi_link_state: c_int,
-        pub ifi_mtu: u64,
-        pub ifi_metric: u64,
-        pub ifi_baudrate: u64,
-        pub ifi_ipackets: u64,
-        pub ifi_ierrors: u64,
-        pub ifi_opackets: u64,
-        pub ifi_oerrors: u64,
-        pub ifi_collisions: u64,
-        pub ifi_ibytes: u64,
-        pub ifi_obytes: u64,
-        pub ifi_imcasts: u64,
-        pub ifi_omcasts: u64,
-        pub ifi_iqdrops: u64,
-        pub ifi_noproto: u64,
-        pub ifi_lastchange: crate::timespec,
-    }
-
-    pub struct if_msghdr {
-        pub ifm_msglen: c_ushort,
-        pub ifm_version: c_uchar,
-        pub ifm_type: c_uchar,
-        pub ifm_addrs: c_int,
-        pub ifm_flags: c_int,
-        pub ifm_index: c_ushort,
-        pub ifm_data: if_data,
-    }
-
     pub struct sockcred {
         pub sc_pid: crate::pid_t,
         pub sc_uid: crate::uid_t,
@@ -685,15 +653,6 @@ s! {
         pub descr_str: [c_char; 1],
     }
 
-    pub struct ifreq {
-        pub _priv: [[c_char; 6]; 24],
-    }
-
-    pub struct ifconf {
-        pub ifc_len: c_int,
-        pub ifc_ifcu: __c_anonymous_ifc_ifcu,
-    }
-
     pub struct tcp_info {
         pub tcpi_state: u8,
         pub __tcpi_ca_state: u8,
@@ -797,11 +756,6 @@ s_no_extra_traits! {
         pub open: __c_anonymous_posix_spawn_fae_open,
         pub dup2: __c_anonymous_posix_spawn_fae_dup2,
     }
-
-    pub union __c_anonymous_ifc_ifcu {
-        pub ifcu_buf: *mut c_void,
-        pub ifcu_req: *mut ifreq,
-    }
 }
 
 cfg_if! {
@@ -820,21 +774,6 @@ cfg_if! {
                 }
             }
         }
-
-        impl Eq for __c_anonymous_ifc_ifcu {}
-        impl PartialEq for __c_anonymous_ifc_ifcu {
-            fn eq(&self, other: &__c_anonymous_ifc_ifcu) -> bool {
-                unsafe { self.ifcu_buf == other.ifcu_buf || self.ifcu_req == other.ifcu_req }
-            }
-        }
-        impl hash::Hash for __c_anonymous_ifc_ifcu {
-            fn hash<H: hash::Hasher>(&self, state: &mut H) {
-                unsafe {
-                    self.ifcu_buf.hash(state);
-                    self.ifcu_req.hash(state);
-                }
-            }
-        }
     }
 }
 
@@ -1000,21 +939,6 @@ pub const LOCAL_PEEREID: c_int = 0x0003; // get peer identification
 pub const LOCAL_CREDS: c_int = 0x0004; // pass credentials to receiver
 
 // https://github.com/NetBSD/src/blob/trunk/sys/net/if.h#L373
-pub const IFF_UP: c_int = 0x0001; // interface is up
-pub const IFF_BROADCAST: c_int = 0x0002; // broadcast address valid
-pub const IFF_DEBUG: c_int = 0x0004; // turn on debugging
-pub const IFF_LOOPBACK: c_int = 0x0008; // is a loopback net
-pub const IFF_POINTOPOINT: c_int = 0x0010; // interface is point-to-point link
-pub const IFF_RUNNING: c_int = 0x0040; // resources allocated
-pub const IFF_NOARP: c_int = 0x0080; // no address resolution protocol
-pub const IFF_PROMISC: c_int = 0x0100; // receive all packets
-pub const IFF_ALLMULTI: c_int = 0x0200; // receive all multicast packets
-pub const IFF_OACTIVE: c_int = 0x0400; // transmission in progress
-pub const IFF_SIMPLEX: c_int = 0x0800; // can't hear own transmissions
-pub const IFF_LINK0: c_int = 0x1000; // per link layer defined bit
-pub const IFF_LINK1: c_int = 0x2000; // per link layer defined bit
-pub const IFF_LINK2: c_int = 0x4000; // per link layer defined bit
-pub const IFF_MULTICAST: c_int = 0x8000; // supports multicast
 
 // sys/netinet/in.h
 // Protocols (RFC 1700)