Adjust to changed libc_bitflags macro and constants.

Author: Markus Wanner (mwa)

src/net/if_.rs

@@ -20,37 +20,37 @@ pub fn if_nametoindex<P: ?Sized + NixPath>(name: &P) -> Result<c_uint> {
 
 libc_bitflags!(
     /// Standard interface flags, used by `getifaddrs`
-    pub flags InterfaceFlags: libc::c_int {
+    pub struct InterfaceFlags: libc::c_int {
         #[cfg(any(target_os = "linux", target_os = "android"))]
-        IFF_UP,
+        IFF_UP;
         #[cfg(any(target_os = "linux", target_os = "android"))]
-        IFF_BROADCAST,
+        IFF_BROADCAST;
         #[cfg(any(target_os = "linux", target_os = "android"))]
-        IFF_DEBUG,
-        IFF_LOOPBACK,
+        IFF_DEBUG;
+        IFF_LOOPBACK;
         #[cfg(any(target_os = "linux", target_os = "android"))]
-        IFF_POINTOPOINT,
+        IFF_POINTOPOINT;
         #[cfg(any(target_os = "linux", target_os = "android"))]
-        IFF_NOTRAILERS,
+        IFF_NOTRAILERS;
         #[cfg(any(target_os = "linux", target_os = "android"))]
-        IFF_RUNNING,
+        IFF_RUNNING;
         #[cfg(any(target_os = "linux", target_os = "android"))]
-        IFF_NOARP,
+        IFF_NOARP;
         #[cfg(any(target_os = "linux", target_os = "android"))]
-        IFF_PROMISC,
+        IFF_PROMISC;
         #[cfg(any(target_os = "linux", target_os = "android"))]
-        IFF_ALLMULTI,
+        IFF_ALLMULTI;
         #[cfg(any(target_os = "linux", target_os = "android"))]
-        IFF_MASTER,
+        IFF_MASTER;
         #[cfg(any(target_os = "linux", target_os = "android"))]
-        IFF_SLAVE,
+        IFF_SLAVE;
         #[cfg(any(target_os = "linux", target_os = "android"))]
-        IFF_MULTICAST,
+        IFF_MULTICAST;
         #[cfg(any(target_os = "linux", target_os = "android"))]
-        IFF_PORTSEL,
+        IFF_PORTSEL;
         #[cfg(any(target_os = "linux", target_os = "android"))]
-        IFF_AUTOMEDIA,
+        IFF_AUTOMEDIA;
         #[cfg(any(target_os = "linux", target_os = "android"))]
-        IFF_DYNAMIC
+        IFF_DYNAMIC;
     }
 );

src/sys/socket/addr.rs

@@ -204,15 +204,15 @@ pub enum AddressFamily {
 impl AddressFamily {
     pub fn from_i32(family: i32) -> Option<AddressFamily> {
         match family {
-            consts::AF_UNIX => Some(AddressFamily::Unix),
-            consts::AF_INET => Some(AddressFamily::Inet),
-            consts::AF_INET6 => Some(AddressFamily::Inet6),
+            libc::AF_UNIX => Some(AddressFamily::Unix),
+            libc::AF_INET => Some(AddressFamily::Inet),
+            libc::AF_INET6 => Some(AddressFamily::Inet6),
             #[cfg(any(target_os = "linux", target_os = "android"))]
-            consts::AF_NETLINK => Some(AddressFamily::Netlink),
+            libc::AF_NETLINK => Some(AddressFamily::Netlink),
             #[cfg(any(target_os = "linux", target_os = "android"))]
-            consts::AF_PACKET => Some(AddressFamily::Packet),
+            libc::AF_PACKET => Some(AddressFamily::Packet),
             #[cfg(any(target_os = "macos", target_os = "ios"))]
-            consts::AF_SYSTEM => Some(AddressFamily::System),
+            libc::AF_SYSTEM => Some(AddressFamily::System),
             _ => None
         }
     }
@@ -716,13 +716,15 @@ impl SockAddr {
                     InetAddr::V4(*(addr as *mut libc::sockaddr_in)))),
                 Some(AddressFamily::Inet6) => Some(SockAddr::Inet(
                     InetAddr::V6(*(addr as *mut libc::sockaddr_in6)))),
-                #[cfg(any(target_os = "linux", target_os = "android"))]
-                Some(AddressFamily::Netlink) => None,
-                #[cfg(any(target_os = "linux", target_os = "android"))]
-                Some(AddressFamily::Packet) => None,
-                #[cfg(any(target_os = "macos", target_os = "ios"))]
-                Some(AddressFamily::System) => None,
-                None => None
+                #[cfg(any(target_os = "android", target_os = "linux"))]
+                Some(AddressFamily::Netlink) => Some(SockAddr::Netlink(
+                    NetlinkAddr(*(addr as *mut libc::sockaddr_nl)))),
+                #[cfg(any(target_os = "ios", target_os = "macos"))]
+                Some(AddressFamily::SysControl) => Some(SockAddr::SysControl(
+                    SysControlAddr(*(addr as *mut sys_control::sockaddr_ctl)))),
+                // No other address families are supported, including netlink and syscontrol.
+                Some(_) => None,
+                None => None,
             }
         }
     }