void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-08-01 22:52:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add a few casts for portability.

Browse source
This commit is contained in:
Adam Ierymenko 2022-07-08 18:23:24 -04:00
parent 02565c04a9
commit 4128bbe6f2
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
zerotier-network-hypervisor/src/vl1/inetaddress.rs
View file

@ -460,19 +460,19 @@ impl InetAddress {
/// Check if this is an IPv4 address. /// Check if this is an IPv4 address.
#[inline(always)] #[inline(always)]
pub fn is_ipv4(&self) -> bool { pub fn is_ipv4(&self) -> bool {
unsafe { self.sa.sa_family == AF_INET } unsafe { self.sa.sa_family as AddressFamilyType == AF_INET }
} }
/// Check if this is an IPv6 address. /// Check if this is an IPv6 address.
#[inline(always)] #[inline(always)]
pub fn is_ipv6(&self) -> bool { pub fn is_ipv6(&self) -> bool {
unsafe { self.sa.sa_family == AF_INET6 } unsafe { self.sa.sa_family as AddressFamilyType == AF_INET6 }
} }
/// Check if this is either an IPv4 or an IPv6 address. /// Check if this is either an IPv4 or an IPv6 address.
#[inline(always)] #[inline(always)]
pub fn is_ip(&self) -> bool { pub fn is_ip(&self) -> bool {
let family = unsafe { self.sa.sa_family }; let family = unsafe { self.sa.sa_family } as AddressFamilyType;
family == AF_INET || family == AF_INET6 family == AF_INET || family == AF_INET6
} }
@ -488,7 +488,7 @@ impl InetAddress {
#[inline(always)] #[inline(always)]
pub fn c_sockaddr(&self) -> (*const (), usize) { pub fn c_sockaddr(&self) -> (*const (), usize) {
unsafe { unsafe {
match self.sa.sa_family { match self.sa.sa_family as AddressFamilyType {
AF_INET => ((&self.sin as *const sockaddr_in).cast(), size_of::<sockaddr_in>()), AF_INET => ((&self.sin as *const sockaddr_in).cast(), size_of::<sockaddr_in>()),
AF_INET6 => ((&self.sin6 as *const sockaddr_in6).cast(), size_of::<sockaddr_in6>()), AF_INET6 => ((&self.sin6 as *const sockaddr_in6).cast(), size_of::<sockaddr_in6>()),
_ => (null(), 0), _ => (null(), 0),
@ -535,7 +535,7 @@ impl InetAddress {
/// Get a Rust stdlib SocketAddr structure from this InetAddress. /// Get a Rust stdlib SocketAddr structure from this InetAddress.
pub fn to_socketaddr(&self) -> Option<SocketAddr> { pub fn to_socketaddr(&self) -> Option<SocketAddr> {
unsafe { unsafe {
match self.sa.sa_family { match self.sa.sa_family as AddressFamilyType {
AF_INET => Some(SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::from(self.sin.sin_addr.s_addr.to_ne_bytes()), u16::from_be(self.sin.sin_port as u16)))), AF_INET => Some(SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::from(self.sin.sin_addr.s_addr.to_ne_bytes()), u16::from_be(self.sin.sin_port as u16)))),
AF_INET6 => Some(SocketAddr::V6(SocketAddrV6::new(Ipv6Addr::from(self.sin6.sin6_addr.s6_addr), u16::from_be(self.sin6.sin6_port as u16), 0, 0))), AF_INET6 => Some(SocketAddr::V6(SocketAddrV6::new(Ipv6Addr::from(self.sin6.sin6_addr.s6_addr), u16::from_be(self.sin6.sin6_port as u16), 0, 0))),
_ => None, _ => None,