Make ifaddrs.ifa_ifu an union

Author: kellda

libc-test/build.rs

@@ -973,8 +973,6 @@ fn test_netbsd(target: &str) {
     });
 
     cfg.skip_field_type(move |struct_, field| {
-        // This is a weird union, don't check the type.
-        (struct_ == "ifaddrs" && field == "ifa_ifu") ||
         // sighandler_t type is super weird
         (struct_ == "sigaction" && field == "sa_sigaction") ||
         // aio_buf is "volatile void*" and Rust doesn't understand volatile
@@ -1174,8 +1172,6 @@ fn test_dragonflybsd(target: &str) {
     });
 
     cfg.skip_field_type(move |struct_, field| {
-        // This is a weird union, don't check the type.
-        (struct_ == "ifaddrs" && field == "ifa_ifu") ||
         // sighandler_t type is super weird
         (struct_ == "sigaction" && field == "sa_sigaction") ||
         // aio_buf is "volatile void*" and Rust doesn't understand volatile
@@ -1506,11 +1502,6 @@ fn test_android(target: &str) {
         }
     });
 
-    cfg.skip_field_type(move |struct_, field| {
-        // This is a weird union, don't check the type.
-        struct_ == "ifaddrs" && field == "ifa_ifu"
-    });
-
     cfg.skip_field(move |struct_, field| {
         // this is actually a union on linux, so we can't represent it well and
         // just insert some padding.
@@ -1986,6 +1977,9 @@ fn test_emscripten(target: &str) {
     });
 
     cfg.skip_struct(move |ty| {
+        if ty.starts_with("__c_anonymous_") {
+            return true;
+        }
         match ty {
             // FIXME: It was removed in
             // emscripten-core/emscripten@953e414
@@ -2029,9 +2023,6 @@ fn test_emscripten(target: &str) {
     });
 
     cfg.skip_field_type(move |struct_, field| {
-        // This is a weird union, don't check the type.
-        // FIXME: is this necessary?
-        (struct_ == "ifaddrs" && field == "ifa_ifu") ||
         // sighandler_t type is super weird
         // FIXME: is this necessary?
         (struct_ == "sigaction" && field == "sa_sigaction") ||

src/fuchsia/mod.rs

@@ -463,8 +463,8 @@ s! {
         pub ifa_flags: ::c_uint,
         pub ifa_addr: *mut ::sockaddr,
         pub ifa_netmask: *mut ::sockaddr,
-        pub ifa_ifu: *mut ::sockaddr, // FIXME This should be a union
-        pub ifa_data: *mut ::c_void
+        pub ifa_ifu: __c_anonymous_ifa_ifu,
+        pub ifa_data: *mut ::c_void,
     }
 
     pub struct passwd {
@@ -974,6 +974,11 @@ s_no_extra_traits! {
         pub sival_int: ::int,
         pub sival_ptr: *mut ::c_void,
     }
+
+    pub union __c_anonymous_ifa_ifu {
+        ifu_broadaddr: *mut sockaddr,
+        ifu_dstaddr: *mut sockaddr,
+    }
 }
 
 cfg_if! {
@@ -1320,6 +1325,25 @@ cfg_if! {
                 unsafe { (self.sival_ptr as usize).hash(state) };
             }
         }
+
+        impl PartialEq for __c_anonymous_ifa_ifu {
+            fn eq(&self, other: &__c_anonymous_ifa_ifu) -> bool {
+                unsafe { self.ifu_dstaddr == other.ifu_dstaddr }
+            }
+        }
+        impl Eq for __c_anonymous_ifa_ifu {}
+        impl ::fmt::Debug for __c_anonymous_ifa_ifu {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("ifa_ifu")
+                    .field("ifu_dstaddr", unsafe { &self.ifu_dstaddr } )
+                    .finish()
+            }
+        }
+        impl ::hash::Hash for __c_anonymous_ifa_ifu {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                unsafe { self.ifu_dstaddr.hash(state) };
+            }
+        }
     }
 }
 

src/unix/linux_like/mod.rs

@@ -157,8 +157,8 @@ s! {
         pub ifa_flags: ::c_uint,
         pub ifa_addr: *mut ::sockaddr,
         pub ifa_netmask: *mut ::sockaddr,
-        pub ifa_ifu: *mut ::sockaddr, // FIXME This should be a union
-        pub ifa_data: *mut ::c_void
+        pub ifa_ifu: __c_anonymous_ifa_ifu,
+        pub ifa_data: *mut ::c_void,
     }
 
     pub struct in6_rtmsg {
@@ -252,6 +252,11 @@ s_no_extra_traits! {
         #[cfg(target_pointer_width = "32")]
         __unused1: [::c_int; 12]
     }
+
+    pub union __c_anonymous_ifa_ifu {
+        ifu_broadaddr: *mut sockaddr,
+        ifu_dstaddr: *mut sockaddr,
+    }
 }
 
 cfg_if! {
@@ -427,6 +432,25 @@ cfg_if! {
                 self.sigev_notify_thread_id.hash(state);
             }
         }
+
+        impl PartialEq for __c_anonymous_ifa_ifu {
+            fn eq(&self, other: &__c_anonymous_ifa_ifu) -> bool {
+                unsafe { self.ifu_dstaddr == other.ifu_dstaddr }
+            }
+        }
+        impl Eq for __c_anonymous_ifa_ifu {}
+        impl ::fmt::Debug for __c_anonymous_ifa_ifu {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("ifa_ifu")
+                    .field("ifu_dstaddr", unsafe { &self.ifu_dstaddr } )
+                    .finish()
+            }
+        }
+        impl ::hash::Hash for __c_anonymous_ifa_ifu {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                unsafe { self.ifu_dstaddr.hash(state) };
+            }
+        }
     }
 }
 

src/unix/uclibc/mod.rs

@@ -184,8 +184,8 @@ s! {
         pub ifa_flags: ::c_uint,
         pub ifa_addr: *mut ::sockaddr,
         pub ifa_netmask: *mut ::sockaddr,
-        pub ifa_ifu: *mut ::sockaddr, // FIXME This should be a union
-        pub ifa_data: *mut ::c_void
+        pub ifa_ifu: __c_anonymous_ifa_ifu,
+        pub ifa_data: *mut ::c_void,
     }
 
     pub struct pthread_rwlockattr_t {
@@ -436,6 +436,11 @@ s_no_extra_traits! {
         #[cfg(target_pointer_width = "32")]
         __unused1: [::c_int; 12]
     }
+
+    pub union __c_anonymous_ifa_ifu {
+        ifu_broadaddr: *mut sockaddr,
+        ifu_dstaddr: *mut sockaddr,
+    }
 }
 
 cfg_if! {
@@ -522,6 +527,25 @@ cfg_if! {
                 self.sigev_notify_thread_id.hash(state);
             }
         }
+
+        impl PartialEq for __c_anonymous_ifa_ifu {
+            fn eq(&self, other: &__c_anonymous_ifa_ifu) -> bool {
+                unsafe { self.ifu_dstaddr == other.ifu_dstaddr }
+            }
+        }
+        impl Eq for __c_anonymous_ifa_ifu {}
+        impl ::fmt::Debug for __c_anonymous_ifa_ifu {
+            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
+                f.debug_struct("ifa_ifu")
+                    .field("ifu_dstaddr", unsafe { &self.ifu_dstaddr } )
+                    .finish()
+            }
+        }
+        impl ::hash::Hash for __c_anonymous_ifa_ifu {
+            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
+                unsafe { self.ifu_dstaddr.hash(state) };
+            }
+        }
     }
 }