void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-08 05:23:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Windows fixes... not quite ported yet but almost there.

Browse source
This commit is contained in:
Adam Ierymenko 2022-12-05 16:58:33 -05:00
parent 330ec11e4a
commit 7c2e0b8507
6 changed files with 191 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crypto/src/aes.rs
View file

@ -339,6 +339,7 @@ mod openssl_aes {
#[inline(always)] #[inline(always)]
pub fn encrypt_block(&self, plaintext: &[u8], ciphertext: &mut [u8]) { pub fn encrypt_block(&self, plaintext: &[u8], ciphertext: &mut [u8]) {
#[allow(invalid_value)]
let mut tmp: [u8; 32] = unsafe { MaybeUninit::uninit().assume_init() }; let mut tmp: [u8; 32] = unsafe { MaybeUninit::uninit().assume_init() };
let c: &mut Crypter = unsafe { &mut *self.0.get() }; let c: &mut Crypter = unsafe { &mut *self.0.get() };
if c.update(plaintext, &mut tmp).unwrap() != 16 { if c.update(plaintext, &mut tmp).unwrap() != 16 {
@ -349,6 +350,7 @@ mod openssl_aes {
#[inline(always)] #[inline(always)]
pub fn encrypt_block_in_place(&self, data: &mut [u8]) { pub fn encrypt_block_in_place(&self, data: &mut [u8]) {
#[allow(invalid_value)]
let mut tmp: [u8; 32] = unsafe { MaybeUninit::uninit().assume_init() }; let mut tmp: [u8; 32] = unsafe { MaybeUninit::uninit().assume_init() };
let c: &mut Crypter = unsafe { &mut *self.0.get() }; let c: &mut Crypter = unsafe { &mut *self.0.get() };
if c.update(data, &mut tmp).unwrap() != 16 { if c.update(data, &mut tmp).unwrap() != 16 {
@ -359,6 +361,7 @@ mod openssl_aes {
#[inline(always)] #[inline(always)]
pub fn decrypt_block(&self, ciphertext: &[u8], plaintext: &mut [u8]) { pub fn decrypt_block(&self, ciphertext: &[u8], plaintext: &mut [u8]) {
#[allow(invalid_value)]
let mut tmp: [u8; 32] = unsafe { MaybeUninit::uninit().assume_init() }; let mut tmp: [u8; 32] = unsafe { MaybeUninit::uninit().assume_init() };
let c: &mut Crypter = unsafe { &mut *self.1.get() }; let c: &mut Crypter = unsafe { &mut *self.1.get() };
if c.update(ciphertext, &mut tmp).unwrap() != 16 { if c.update(ciphertext, &mut tmp).unwrap() != 16 {
@ -369,6 +372,7 @@ mod openssl_aes {
#[inline(always)] #[inline(always)]
pub fn decrypt_block_in_place(&self, data: &mut [u8]) { pub fn decrypt_block_in_place(&self, data: &mut [u8]) {
#[allow(invalid_value)]
let mut tmp: [u8; 32] = unsafe { MaybeUninit::uninit().assume_init() }; let mut tmp: [u8; 32] = unsafe { MaybeUninit::uninit().assume_init() };
let c: &mut Crypter = unsafe { &mut *self.1.get() }; let c: &mut Crypter = unsafe { &mut *self.1.get() };
if c.update(data, &mut tmp).unwrap() != 16 { if c.update(data, &mut tmp).unwrap() != 16 {

1
network-hypervisor/Cargo.toml
View file

@ -16,6 +16,7 @@ base64 = "^0"
lz4_flex = { version = "^0", features = ["safe-encode", "safe-decode", "checked-decode"] } lz4_flex = { version = "^0", features = ["safe-encode", "safe-decode", "checked-decode"] }
serde = { version = "^1", features = ["derive"], default-features = false } serde = { version = "^1", features = ["derive"], default-features = false }
phf = { version = "^0", features = ["macros", "std"], default-features = false } phf = { version = "^0", features = ["macros", "std"], default-features = false }
num-traits = "^0"
[dev-dependencies] [dev-dependencies]
rand = "*" rand = "*"

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

@ -7,14 +7,34 @@ use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV
use std::ptr::{copy_nonoverlapping, null, slice_from_raw_parts, write_bytes}; use std::ptr::{copy_nonoverlapping, null, slice_from_raw_parts, write_bytes};
use std::str::FromStr; use std::str::FromStr;
#[allow(unused_imports)]
use num_traits::AsPrimitive;
use serde::{Deserialize, Deserializer, Serialize, Serializer}; use serde::{Deserialize, Deserializer, Serialize, Serializer};
use zerotier_utils::buffer::Buffer; use zerotier_utils::buffer::Buffer;
use zerotier_utils::error::{InvalidFormatError, InvalidParameterError}; use zerotier_utils::error::{InvalidFormatError, InvalidParameterError};
use zerotier_utils::marshalable::{Marshalable, UnmarshalError}; use zerotier_utils::marshalable::{Marshalable, UnmarshalError};
#[allow(non_camel_case_types)]
#[cfg(windows)] #[cfg(windows)]
use winapi::um::winsock2; type sockaddr = winapi::shared::ws2def::SOCKADDR;
#[allow(non_camel_case_types)]
#[cfg(windows)]
type sockaddr_in = winapi::shared::ws2def::SOCKADDR_IN;
#[allow(non_camel_case_types)]
#[cfg(windows)]
type sockaddr_in6 = winapi::shared::ws2ipdef::SOCKADDR_IN6;
#[allow(non_camel_case_types)]
#[cfg(windows)]
type sockaddr_storage = winapi::shared::ws2def::SOCKADDR_STORAGE;
#[allow(non_camel_case_types)]
#[cfg(windows)]
type in6_addr = winapi::shared::in6addr::in6_addr;
#[allow(non_camel_case_types)] #[allow(non_camel_case_types)]
#[cfg(not(windows))] #[cfg(not(windows))]
@ -42,7 +62,19 @@ pub type AddressFamilyType = u8;
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
pub type AddressFamilyType = u16; pub type AddressFamilyType = u16;
#[cfg(windows)]
pub type AddressFamilyType = winapi::ctypes::c_int;
#[cfg(windows)]
pub const AF_INET: AddressFamilyType = winapi::shared::ws2def::AF_INET as AddressFamilyType;
#[cfg(windows)]
pub const AF_INET6: AddressFamilyType = winapi::shared::ws2def::AF_INET6 as AddressFamilyType;
#[cfg(not(windows))]
pub const AF_INET: AddressFamilyType = libc::AF_INET as AddressFamilyType; pub const AF_INET: AddressFamilyType = libc::AF_INET as AddressFamilyType;
#[cfg(not(windows))]
pub const AF_INET6: AddressFamilyType = libc::AF_INET6 as AddressFamilyType; pub const AF_INET6: AddressFamilyType = libc::AF_INET6 as AddressFamilyType;
#[repr(u8)] #[repr(u8)]
@ -57,6 +89,29 @@ pub enum IpScope {
Private = 7, Private = 7,
} }
#[cfg(windows)]
#[inline(always)]
fn get_s_addr(sa: &sockaddr_in) -> u32 {
unsafe { *sa.sin_addr.S_un.S_addr() }
}
#[cfg(not(windows))]
#[inline(always)]
fn get_s_addr(sa: &sockaddr_in) -> u32 {
sa.sin_addr.s_addr as u32
}
#[cfg(windows)]
#[inline(always)]
fn get_s6_addr(&sa: &sockaddr_in6) -> &[u8; 16] {
unsafe { &*(sa.sin6_addr.u.Byte() as *const [u8; 16]) }
}
#[cfg(not(windows))]
fn get_s6_addr(&sa: &sockaddr_in6) -> &[u8; 16] {
&sa.sin6_addr.s6_addr
}
/// An IPv4 or IPv6 socket address that directly encapsulates C sockaddr types. /// An IPv4 or IPv6 socket address that directly encapsulates C sockaddr types.
/// ///
/// The ZeroTier core uses this in preference to std::net stuff so this can be /// The ZeroTier core uses this in preference to std::net stuff so this can be
@ -102,13 +157,15 @@ impl TryInto<IpAddr> for &InetAddress {
#[inline(always)] #[inline(always)]
fn try_into(self) -> Result<IpAddr, Self::Error> { fn try_into(self) -> Result<IpAddr, Self::Error> {
match unsafe { self.sa.sa_family } { unsafe {
AF_INET => Ok(IpAddr::V4(Ipv4Addr::from(unsafe { self.sin.sin_addr.s_addr.to_ne_bytes() }))), match self.sa.sa_family as AddressFamilyType {
AF_INET6 => Ok(IpAddr::V6(Ipv6Addr::from(unsafe { self.sin6.sin6_addr.s6_addr }))), AF_INET => Ok(IpAddr::V4(Ipv4Addr::from(get_s_addr(&self.sin).to_ne_bytes()))),
AF_INET6 => Ok(IpAddr::V6(Ipv6Addr::from(*get_s6_addr(&self.sin6)))),
_ => Err(InvalidParameterError("not an IP address")), _ => Err(InvalidParameterError("not an IP address")),
} }
} }
} }
}
impl TryInto<Ipv4Addr> for InetAddress { impl TryInto<Ipv4Addr> for InetAddress {
type Error = InvalidParameterError; type Error = InvalidParameterError;
@ -124,8 +181,8 @@ impl TryInto<Ipv4Addr> for &InetAddress {
#[inline(always)] #[inline(always)]
fn try_into(self) -> Result<Ipv4Addr, Self::Error> { fn try_into(self) -> Result<Ipv4Addr, Self::Error> {
match unsafe { self.sa.sa_family } { match unsafe { self.sa.sa_family } as AddressFamilyType {
AF_INET => Ok(Ipv4Addr::from(unsafe { self.sin.sin_addr.s_addr.to_ne_bytes() })), AF_INET => Ok(Ipv4Addr::from(unsafe { get_s_addr(&self.sin).to_ne_bytes() })),
_ => Err(InvalidParameterError("not an IPv4 address")), _ => Err(InvalidParameterError("not an IPv4 address")),
} }
} }
@ -145,8 +202,8 @@ impl TryInto<Ipv6Addr> for &InetAddress {
#[inline(always)] #[inline(always)]
fn try_into(self) -> Result<Ipv6Addr, Self::Error> { fn try_into(self) -> Result<Ipv6Addr, Self::Error> {
match unsafe { self.sa.sa_family } { match unsafe { self.sa.sa_family } as AddressFamilyType {
AF_INET6 => Ok(Ipv6Addr::from(unsafe { self.sin6.sin6_addr.s6_addr })), AF_INET6 => Ok(Ipv6Addr::from(*get_s6_addr(unsafe { &self.sin6 }))),
_ => Err(InvalidParameterError("not an IPv6 address")), _ => Err(InvalidParameterError("not an IPv6 address")),
} }
} }
@ -167,13 +224,13 @@ impl TryInto<SocketAddr> for &InetAddress {
#[inline(always)] #[inline(always)]
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 as AddressFamilyType {
AF_INET => Ok(SocketAddr::V4(SocketAddrV4::new( AF_INET => Ok(SocketAddr::V4(SocketAddrV4::new(
Ipv4Addr::from(self.sin.sin_addr.s_addr.to_ne_bytes()), Ipv4Addr::from(get_s_addr(&self.sin).to_ne_bytes()),
u16::from_be(self.sin.sin_port as u16), u16::from_be(self.sin.sin_port as u16),
))), ))),
AF_INET6 => Ok(SocketAddr::V6(SocketAddrV6::new( AF_INET6 => Ok(SocketAddr::V6(SocketAddrV6::new(
Ipv6Addr::from(self.sin6.sin6_addr.s6_addr), Ipv6Addr::from(*get_s6_addr(&self.sin6)),
u16::from_be(self.sin6.sin6_port as u16), u16::from_be(self.sin6.sin6_port as u16),
0, 0,
0, 0,
@ -199,9 +256,9 @@ impl TryInto<SocketAddrV4> for &InetAddress {
#[inline(always)] #[inline(always)]
fn try_into(self) -> Result<SocketAddrV4, Self::Error> { fn try_into(self) -> Result<SocketAddrV4, Self::Error> {
unsafe { unsafe {
match self.sa.sa_family { match self.sa.sa_family as AddressFamilyType {
AF_INET => Ok(SocketAddrV4::new( AF_INET => Ok(SocketAddrV4::new(
Ipv4Addr::from(self.sin.sin_addr.s_addr.to_ne_bytes()), Ipv4Addr::from(get_s_addr(&self.sin).to_ne_bytes()),
u16::from_be(self.sin.sin_port as u16), u16::from_be(self.sin.sin_port as u16),
)), )),
_ => Err(InvalidParameterError("not an IPv4 address")), _ => Err(InvalidParameterError("not an IPv4 address")),
@ -225,9 +282,9 @@ impl TryInto<SocketAddrV6> for &InetAddress {
#[inline] #[inline]
fn try_into(self) -> Result<SocketAddrV6, Self::Error> { fn try_into(self) -> Result<SocketAddrV6, Self::Error> {
unsafe { unsafe {
match self.sa.sa_family { match self.sa.sa_family as AddressFamilyType {
AF_INET6 => Ok(SocketAddrV6::new( AF_INET6 => Ok(SocketAddrV6::new(
Ipv6Addr::from(self.sin6.sin6_addr.s6_addr), Ipv6Addr::from(*get_s6_addr(&self.sin6)),
u16::from_be(self.sin6.sin6_port as u16), u16::from_be(self.sin6.sin6_port as u16),
0, 0,
0, 0,
@ -443,24 +500,29 @@ impl InetAddress {
/// Get an instance of 127.0.0.1/port /// Get an instance of 127.0.0.1/port
pub fn ipv4_loopback(port: u16) -> InetAddress { pub fn ipv4_loopback(port: u16) -> InetAddress {
let mut addr = Self::new(); let mut addr = Self::new();
addr.sin.sin_family = AF_INET.into(); addr.sin.sin_family = AF_INET.as_();
addr.sin.sin_port = port.to_be().into(); addr.sin.sin_port = port.to_be().as_();
#[cfg(not(windows))] {
addr.sin.sin_addr.s_addr = (0x7f000001 as u32).to_be(); addr.sin.sin_addr.s_addr = (0x7f000001 as u32).to_be();
}
#[cfg(windows)] unsafe {
*addr.sin.sin_addr.S_un.S_addr_mut() = (0x7f000001 as u32).to_be();
}
addr addr
} }
/// Get an instance of 0.0.0.0/0 /// Get an instance of 0.0.0.0/0
pub fn ipv4_any() -> InetAddress { pub fn ipv4_any() -> InetAddress {
let mut addr = Self::new(); let mut addr = Self::new();
addr.sin.sin_family = AF_INET.into(); addr.sin.sin_family = AF_INET.as_();
addr addr
} }
/// Get an instance of ::1/port /// Get an instance of ::1/port
pub fn ipv6_loopback(port: u16) -> InetAddress { pub fn ipv6_loopback(port: u16) -> InetAddress {
let mut addr = Self::new(); let mut addr = Self::new();
addr.sin6.sin6_family = AF_INET6.into(); addr.sin6.sin6_family = AF_INET6.as_();
addr.sin6.sin6_port = port.to_be().into(); addr.sin6.sin6_port = port.to_be().as_();
unsafe { unsafe {
*((&mut (addr.sin6.sin6_addr) as *mut in6_addr).cast::<u8>().offset(15)) = 1; *((&mut (addr.sin6.sin6_addr) as *mut in6_addr).cast::<u8>().offset(15)) = 1;
} }
@ -470,7 +532,7 @@ impl InetAddress {
/// Get an instance of ::0/0 /// Get an instance of ::0/0
pub fn ipv6_any() -> InetAddress { pub fn ipv6_any() -> InetAddress {
let mut addr = Self::new(); let mut addr = Self::new();
addr.sin6.sin6_family = AF_INET6.into(); addr.sin6.sin6_family = AF_INET6.as_();
addr addr
} }
@ -529,13 +591,21 @@ impl InetAddress {
let ip2 = ip.as_ref(); let ip2 = ip.as_ref();
unsafe { unsafe {
if ip2.len() == 4 { if ip2.len() == 4 {
self.sin.sin_family = AF_INET.into(); self.sin.sin_family = AF_INET.as_();
self.sin.sin_port = port.into(); self.sin.sin_port = port.as_();
#[cfg(windows)] {
self.sin.sin_addr.S_un.S_un_b_mut().s_b1 = ip2[0];
self.sin.sin_addr.S_un.S_un_b_mut().s_b2 = ip2[1];
self.sin.sin_addr.S_un.S_un_b_mut().s_b3 = ip2[2];
self.sin.sin_addr.S_un.S_un_b_mut().s_b4 = ip2[3];
}
#[cfg(not(windows))] {
copy_nonoverlapping(ip2.as_ptr(), (&mut self.sin.sin_addr.s_addr as *mut u32).cast::<u8>(), 4); copy_nonoverlapping(ip2.as_ptr(), (&mut self.sin.sin_addr.s_addr as *mut u32).cast::<u8>(), 4);
}
AF_INET AF_INET
} else if ip2.len() == 16 { } else if ip2.len() == 16 {
self.sin6.sin6_family = AF_INET6.into(); self.sin6.sin6_family = AF_INET6.as_();
self.sin6.sin6_port = port.into(); self.sin6.sin6_port = port.as_();
copy_nonoverlapping(ip2.as_ptr(), (&mut self.sin6.sin6_addr as *mut in6_addr).cast::<u8>(), 16); copy_nonoverlapping(ip2.as_ptr(), (&mut self.sin6.sin6_addr as *mut in6_addr).cast::<u8>(), 16);
AF_INET6 AF_INET6
} else { } else {
@ -548,7 +618,14 @@ impl InetAddress {
pub fn ip_bytes(&self) -> &[u8] { pub fn ip_bytes(&self) -> &[u8] {
unsafe { unsafe {
match self.sa.sa_family as AddressFamilyType { match self.sa.sa_family as AddressFamilyType {
AF_INET => &*(&self.sin.sin_addr.s_addr as *const u32).cast::<[u8; 4]>(), AF_INET => {
#[cfg(windows)] {
&*(self.sin.sin_addr.S_un.S_addr() as *const u32).cast::<[u8; 4]>()
}
#[cfg(not(windows))] {
&*(&self.sin.sin_addr.s_addr as *const u32).cast::<[u8; 4]>()
}
},
AF_INET6 => &*(&self.sin6.sin6_addr as *const in6_addr).cast::<[u8; 16]>(), AF_INET6 => &*(&self.sin6.sin6_addr as *const in6_addr).cast::<[u8; 16]>(),
_ => &[], _ => &[],
} }
@ -560,11 +637,11 @@ impl InetAddress {
unsafe { unsafe {
match self.sa.sa_family as AddressFamilyType { match self.sa.sa_family as AddressFamilyType {
AF_INET => Some(SocketAddr::V4(SocketAddrV4::new( AF_INET => Some(SocketAddr::V4(SocketAddrV4::new(
Ipv4Addr::from(self.sin.sin_addr.s_addr.to_ne_bytes()), Ipv4Addr::from(get_s_addr(&self.sin).to_ne_bytes()),
u16::from_be(self.sin.sin_port as u16), u16::from_be(self.sin.sin_port as u16),
))), ))),
AF_INET6 => Some(SocketAddr::V6(SocketAddrV6::new( AF_INET6 => Some(SocketAddr::V6(SocketAddrV6::new(
Ipv6Addr::from(self.sin6.sin6_addr.s6_addr), Ipv6Addr::from(*get_s6_addr(&self.sin6)),
u16::from_be(self.sin6.sin6_port as u16), u16::from_be(self.sin6.sin6_port as u16),
0, 0,
0, 0,
@ -594,8 +671,8 @@ impl InetAddress {
let port = port.to_be(); let port = port.to_be();
unsafe { unsafe {
match self.sa.sa_family as AddressFamilyType { match self.sa.sa_family as AddressFamilyType {
AF_INET => self.sin.sin_port = port, AF_INET => self.sin.sin_port = port.as_(),
AF_INET6 => self.sin6.sin6_port = port, AF_INET6 => self.sin6.sin6_port = port.as_(),
_ => {} _ => {}
} }
} }
@ -612,8 +689,8 @@ impl InetAddress {
AF_INET => { AF_INET => {
if cidr_bits <= 32 { if cidr_bits <= 32 {
let discard_bits = 32 - cidr_bits; let discard_bits = 32 - cidr_bits;
if u32::from_be(self.sin.sin_addr.s_addr as u32).wrapping_shr(discard_bits) if u32::from_be(get_s_addr(&self.sin)).wrapping_shr(discard_bits)
== u32::from_be(cidr.sin.sin_addr.s_addr as u32).wrapping_shr(discard_bits) == u32::from_be(get_s_addr(&cidr.sin)).wrapping_shr(discard_bits)
{ {
return true; return true;
} }
@ -621,8 +698,8 @@ impl InetAddress {
} }
AF_INET6 => { AF_INET6 => {
if cidr_bits <= 128 { if cidr_bits <= 128 {
let a = &self.sin6.sin6_addr.s6_addr; let a = get_s6_addr(&self.sin6);
let b = &cidr.sin6.sin6_addr.s6_addr; let b = get_s6_addr(&cidr.sin6);
let mut p = 0; let mut p = 0;
while cidr_bits >= 8 { while cidr_bits >= 8 {
cidr_bits -= 8; cidr_bits -= 8;
@ -649,7 +726,7 @@ impl InetAddress {
unsafe { unsafe {
match self.sa.sa_family as AddressFamilyType { match self.sa.sa_family as AddressFamilyType {
AF_INET => { AF_INET => {
let ip = self.sin.sin_addr.s_addr as u32; let ip = get_s_addr(&self.sin);
let class_a = (ip >> 24) as u8; let class_a = (ip >> 24) as u8;
match class_a { match class_a {
0x00 | 0xff => IpScope::None, // 0.0.0.0/8 and 255.0.0.0/8 are not usable 0x00 | 0xff => IpScope::None, // 0.0.0.0/8 and 255.0.0.0/8 are not usable
@ -774,9 +851,15 @@ impl InetAddress {
unsafe { unsafe {
match self.sa.sa_family as AddressFamilyType { match self.sa.sa_family as AddressFamilyType {
AF_INET => { AF_INET => {
#[cfg(not(windows))] {
let ip = &*(&self.sin.sin_addr.s_addr as *const u32).cast::<[u8; 4]>(); let ip = &*(&self.sin.sin_addr.s_addr as *const u32).cast::<[u8; 4]>();
format!("{}.{}.{}.{}", ip[0], ip[1], ip[2], ip[3]) format!("{}.{}.{}.{}", ip[0], ip[1], ip[2], ip[3])
} }
#[cfg(windows)] {
let ip = self.sin.sin_addr.S_un.S_addr().to_ne_bytes();
format!("{}.{}.{}.{}", ip[0], ip[1], ip[2], ip[3])
}
}
AF_INET6 => Ipv6Addr::from(*(&(self.sin6.sin6_addr) as *const in6_addr).cast::<[u8; 16]>()).to_string(), AF_INET6 => Ipv6Addr::from(*(&(self.sin6.sin6_addr) as *const in6_addr).cast::<[u8; 16]>()).to_string(),
_ => String::from("(null)"), _ => String::from("(null)"),
} }
@ -793,7 +876,7 @@ impl Marshalable for InetAddress {
AF_INET => { AF_INET => {
let b = buf.append_bytes_fixed_get_mut::<7>()?; let b = buf.append_bytes_fixed_get_mut::<7>()?;
b[0] = 4; b[0] = 4;
copy_nonoverlapping((&self.sin.sin_addr.s_addr as *const u32).cast::<u8>(), b.as_mut_ptr().offset(1), 4); b[1..5].copy_from_slice(&get_s_addr(&self.sin).to_ne_bytes());
b[5] = *(&self.sin.sin_port as *const u16).cast::<u8>(); b[5] = *(&self.sin.sin_port as *const u16).cast::<u8>();
b[6] = *(&self.sin.sin_port as *const u16).cast::<u8>().offset(1); b[6] = *(&self.sin.sin_port as *const u16).cast::<u8>().offset(1);
} }
@ -875,13 +958,22 @@ impl FromStr for InetAddress {
unsafe { unsafe {
match ip { match ip {
IpAddr::V4(v4) => { IpAddr::V4(v4) => {
addr.sin.sin_family = AF_INET.into(); addr.sin.sin_family = AF_INET.as_();
addr.sin.sin_port = port.into(); addr.sin.sin_port = port.as_();
#[cfg(windows)] {
let oct = v4.octets();
addr.sin.sin_addr.S_un.S_un_b_mut().s_b1 = oct[0];
addr.sin.sin_addr.S_un.S_un_b_mut().s_b2 = oct[1];
addr.sin.sin_addr.S_un.S_un_b_mut().s_b3 = oct[2];
addr.sin.sin_addr.S_un.S_un_b_mut().s_b4 = oct[3];
}
#[cfg(not(windows))] {
copy_nonoverlapping(v4.octets().as_ptr(), (&mut (addr.sin.sin_addr.s_addr) as *mut u32).cast(), 4); copy_nonoverlapping(v4.octets().as_ptr(), (&mut (addr.sin.sin_addr.s_addr) as *mut u32).cast(), 4);
} }
}
IpAddr::V6(v6) => { IpAddr::V6(v6) => {
addr.sin6.sin6_family = AF_INET6.into(); addr.sin6.sin6_family = AF_INET6.as_();
addr.sin6.sin6_port = port.into(); addr.sin6.sin6_port = port.as_();
copy_nonoverlapping(v6.octets().as_ptr(), (&mut (addr.sin6.sin6_addr) as *mut in6_addr).cast(), 16); copy_nonoverlapping(v6.octets().as_ptr(), (&mut (addr.sin6.sin6_addr) as *mut in6_addr).cast(), 16);
} }
} }
@ -900,7 +992,7 @@ impl PartialEq for InetAddress {
unsafe { unsafe {
if self.sa.sa_family == other.sa.sa_family { if self.sa.sa_family == other.sa.sa_family {
match self.sa.sa_family as AddressFamilyType { match self.sa.sa_family as AddressFamilyType {
AF_INET => self.sin.sin_port == other.sin.sin_port && self.sin.sin_addr.s_addr == other.sin.sin_addr.s_addr, AF_INET => self.sin.sin_port == other.sin.sin_port && get_s_addr(&self.sin) == get_s_addr(&other.sin),
AF_INET6 => { AF_INET6 => {
if self.sin6.sin6_port == other.sin6.sin6_port { if self.sin6.sin6_port == other.sin6.sin6_port {
(*(&(self.sin6.sin6_addr) as *const in6_addr).cast::<[u8; 16]>()) (*(&(self.sin6.sin6_addr) as *const in6_addr).cast::<[u8; 16]>())
@ -937,7 +1029,7 @@ impl Ord for InetAddress {
0 => Ordering::Equal, 0 => Ordering::Equal,
AF_INET => { AF_INET => {
let ip_ordering = let ip_ordering =
u32::from_be(self.sin.sin_addr.s_addr as u32).cmp(&u32::from_be(other.sin.sin_addr.s_addr as u32)); u32::from_be(get_s_addr(&self.sin)).cmp(&u32::from_be(get_s_addr(&other.sin)));
if ip_ordering == Ordering::Equal { if ip_ordering == Ordering::Equal {
u16::from_be(self.sin.sin_port as u16).cmp(&u16::from_be(other.sin.sin_port as u16)) u16::from_be(self.sin.sin_port as u16).cmp(&u16::from_be(other.sin.sin_port as u16))
} else { } else {
@ -995,7 +1087,7 @@ impl Hash for InetAddress {
match self.sa.sa_family as AddressFamilyType { match self.sa.sa_family as AddressFamilyType {
AF_INET => { AF_INET => {
state.write_u16(self.sin.sin_port as u16); state.write_u16(self.sin.sin_port as u16);
state.write_u32(self.sin.sin_addr.s_addr as u32); state.write_u32(get_s_addr(&self.sin));
} }
AF_INET6 => { AF_INET6 => {
state.write_u16(self.sin6.sin6_port as u16); state.write_u16(self.sin6.sin6_port as u16);

6
utils/src/io.rs
View file

@ -34,3 +34,9 @@ pub fn fs_restrict_permissions<P: AsRef<Path>>(path: P) -> bool {
) == 0 ) == 0
} }
} }
/// Set permissions on a file or directory to be most restrictive (visible only to the service's user).
#[cfg(windows)]
pub fn fs_restrict_permissions<P: AsRef<Path>>(path: P) -> bool {
todo!()
}

3
vl1-service/src/sys/getifaddrs.rs
View file

@ -87,6 +87,9 @@ pub fn for_each_address<F: FnMut(&InetAddress, &LocalInterface)>(mut f: F) {
} }
} }
#[cfg(windows)]
pub fn for_each_address<F: FnMut(&InetAddress, &LocalInterface)>(mut f: F) {}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;

31
vl1-service/src/sys/udp.rs
View file

@ -145,6 +145,21 @@ impl BoundUdpSocket {
libc::close(self.fd.as_()); libc::close(self.fd.as_());
} }
} }
#[cfg(windows)]
fn set_ttl(&self, packet_ttl: u8) {
todo!()
}
#[cfg(windows)]
pub fn send(&self, dest: &InetAddress, data: &[u8], packet_ttl: u8) -> bool {
todo!()
}
#[cfg(windows)]
fn close(&self) {
todo!()
}
} }
impl BoundUdpPort { impl BoundUdpPort {
@ -235,8 +250,14 @@ impl BoundUdpPort {
let mut from = InetAddress::new(); let mut from = InetAddress::new();
while ss.open.load(Ordering::Relaxed) { while ss.open.load(Ordering::Relaxed) {
let mut b = bp.get(); let mut b = bp.get();
let mut addrlen = std::mem::size_of::<InetAddress>().as_(); let mut addrlen: usize = std::mem::size_of::<InetAddress>().as_();
let s = libc::recvfrom( let s;
#[cfg(windows)] {
s = 0;
todo!();
}
#[cfg(not(windows))] {
s = libc::recvfrom(
ss.fd.as_(), ss.fd.as_(),
b.entire_buffer_mut().as_mut_ptr().cast(), b.entire_buffer_mut().as_mut_ptr().cast(),
b.capacity().as_(), b.capacity().as_(),
@ -244,6 +265,7 @@ impl BoundUdpPort {
(&mut from as *mut InetAddress).cast(), (&mut from as *mut InetAddress).cast(),
&mut addrlen, &mut addrlen,
); );
}
if s > 0 { if s > 0 {
b.set_size_unchecked(s as usize); b.set_size_unchecked(s as usize);
let time_ticks = ms_monotonic(); let time_ticks = ms_monotonic();
@ -304,6 +326,11 @@ pub fn udp_test_bind(port: u16) -> bool {
.is_ok() .is_ok()
} }
#[cfg(windows)]
unsafe fn bind_udp_to_device(device_name: &str, address: &InetAddress) -> Result<i32, &'static str> {
todo!()
}
#[allow(unused_variables)] #[allow(unused_variables)]
#[cfg(unix)] #[cfg(unix)]
unsafe fn bind_udp_to_device(device_name: &str, address: &InetAddress) -> Result<i32, &'static str> { unsafe fn bind_udp_to_device(device_name: &str, address: &InetAddress) -> Result<i32, &'static str> {