From 8d6c2b3a70c650e4aed47d735c9f236ee45e9d26 Mon Sep 17 00:00:00 2001 From: Alan Somers Date: Tue, 28 Sep 2021 19:09:15 -0600 Subject: Revert "Expose SockAddr::from_raw_sockaddr" This reverts commit ed43d2c65e65dd68c9cf2dcf06f5ec45a44aaccd. As discussed in #1544 the API of this function needs to change. For now, revert the PR that made it public, because it has not yet been included in any release. --- src/ifaddrs.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/ifaddrs.rs') diff --git a/src/ifaddrs.rs b/src/ifaddrs.rs index 74f34050..ed6328f3 100644 --- a/src/ifaddrs.rs +++ b/src/ifaddrs.rs @@ -46,8 +46,8 @@ impl InterfaceAddress { /// Create an `InterfaceAddress` from the libc struct. fn from_libc_ifaddrs(info: &libc::ifaddrs) -> InterfaceAddress { let ifname = unsafe { ffi::CStr::from_ptr(info.ifa_name) }; - let address = unsafe { SockAddr::from_raw_sockaddr(info.ifa_addr) }; - let netmask = unsafe { SockAddr::from_raw_sockaddr(info.ifa_netmask) }; + let address = unsafe { SockAddr::from_libc_sockaddr(info.ifa_addr) }; + let netmask = unsafe { SockAddr::from_libc_sockaddr(info.ifa_netmask) }; let mut addr = InterfaceAddress { interface_name: ifname.to_string_lossy().to_string(), flags: InterfaceFlags::from_bits_truncate(info.ifa_flags as i32), @@ -59,9 +59,9 @@ impl InterfaceAddress { let ifu = get_ifu_from_sockaddr(info); if addr.flags.contains(InterfaceFlags::IFF_POINTOPOINT) { - addr.destination = unsafe { SockAddr::from_raw_sockaddr(ifu) }; + addr.destination = unsafe { SockAddr::from_libc_sockaddr(ifu) }; } else if addr.flags.contains(InterfaceFlags::IFF_BROADCAST) { - addr.broadcast = unsafe { SockAddr::from_raw_sockaddr(ifu) }; + addr.broadcast = unsafe { SockAddr::from_libc_sockaddr(ifu) }; } addr -- cgit v1.2.3