void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-04-26 17:03:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rustfmt

Browse source
This commit is contained in:
Adam Ierymenko 2022-09-13 10:46:18 -04:00
parent 32abd20c38
commit 4763404d98
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
network-hypervisor/src/vl1/inetaddress.rs
View file

@ -82,7 +82,8 @@ impl ToSocketAddrs for InetAddress {
#[inline(always)] #[inline(always)]
fn to_socket_addrs(&self) -> std::io::Result<Self::Iter> { fn to_socket_addrs(&self) -> std::io::Result<Self::Iter> {
self.try_into().map_or_else(|_| Err(std::io::Error::new(std::io::ErrorKind::Other, "not an IP address")), |sa| Ok(std::iter::once(sa))) self.try_into()
.map_or_else(|_| Err(std::io::Error::new(std::io::ErrorKind::Other, "not an IP address")), |sa| Ok(std::iter::once(sa)))
} }
} }
@ -166,8 +167,16 @@ impl TryInto<SocketAddr> for &InetAddress {
fn try_into(self) -> Result<SocketAddr, Self::Error> { fn try_into(self) -> Result<SocketAddr, Self::Error> {
unsafe { unsafe {
match self.sa.sa_family { match self.sa.sa_family {
AF_INET => Ok(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 => Ok(SocketAddr::V4(SocketAddrV4::new(
AF_INET6 => Ok(SocketAddr::V6(SocketAddrV6::new(Ipv6Addr::from(self.sin6.sin6_addr.s6_addr), u16::from_be(self.sin6.sin6_port as u16), 0, 0))), Ipv4Addr::from(self.sin.sin_addr.s_addr.to_ne_bytes()),
u16::from_be(self.sin.sin_port as u16),
))),
AF_INET6 => Ok(SocketAddr::V6(SocketAddrV6::new(
Ipv6Addr::from(self.sin6.sin6_addr.s6_addr),
u16::from_be(self.sin6.sin6_port as u16),
0,
0,
))),
_ => Err(crate::error::InvalidParameterError("not an IP address")), _ => Err(crate::error::InvalidParameterError("not an IP address")),
} }
} }
@ -536,8 +545,16 @@ impl InetAddress {
pub fn to_socketaddr(&self) -> Option<SocketAddr> { pub fn to_socketaddr(&self) -> Option<SocketAddr> {
unsafe { unsafe {
match self.sa.sa_family as AddressFamilyType { 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(
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))), 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,
))),
_ => None, _ => None,
} }
} }