2 Commits
Author SHA1 Message Date
jkortis 20935d2380 fix: resolve OSString typo and coordinator module paths
Build and Release Windows Client / build (push) Failing after 40s
2026-09-30 23:53:18 -04:00
jkortis 727d8c41ca fix: resolve rust compilation errors in tun and dependencies
Build and Release Windows Client / build (push) Failing after 38s
2026-09-30 23:52:06 -04:00
3 changed files with 7 additions and 5 deletions

No files matched your search

+2
View File
@@ -9,6 +9,8 @@ bytes = "1"
tonic = "0.12" tonic = "0.12"
prost = "0.13" prost = "0.13"
crossbeam-queue = "0.3" crossbeam-queue = "0.3"
hex = "0.4"
snow = "0.9"
[profile.release] [profile.release]
opt-level = "z" opt-level = "z"
+2 -2
View File
@@ -1,6 +1,6 @@
use tonic::{Request, Response, Status}; use tonic::{Request, Response, Status};
use coordinator::coordinator_client::CoordinatorClient as GeneratedCoordinatorClient; use crate::coordinator::coordinator_client::CoordinatorClient as GeneratedCoordinatorClient;
use coordinator::{RegisterRequest, RegisterResponse, HeartbeatRequest, HeartbeatResponse, PeerRequest, PeerResponse}; use crate::coordinator::{RegisterRequest, RegisterResponse, HeartbeatRequest, HeartbeatResponse, PeerRequest, PeerResponse};
pub struct CoordinatorClient { pub struct CoordinatorClient {
client: GeneratedCoordinatorClient<tonic::transport::Channel>, client: GeneratedCoordinatorClient<tonic::transport::Channel>,
+3 -3
View File
@@ -1,4 +1,4 @@
use std::ffi::{c_void, OSString, OsString}; use std::ffi::{c_void, OsString};
use std::os::windows::ffi::OsStrExt; use std::os::windows::ffi::OsStrExt;
use std::ptr::{null_mut}; use std::ptr::{null_mut};
use std::io::{self, Read, Write}; use std::io::{self, Read, Write};
@@ -42,7 +42,7 @@ unsafe impl Sync for TunInterface {}
impl TunInterface { impl TunInterface {
pub fn new(name: &str) -> io::Result<Self> { pub fn new(name: &str) -> io::Result<Self> {
let wide_name: Vec<u16> = OSString::from(name).encode_utf16().chain(std::iter::once(0)).collect(); let wide_name: Vec<u16> = OsString::from(name).encode_utf16().chain(std::iter::once(0)).collect();
unsafe { unsafe {
let adapter = WintunOpenAdapter(wide_name.as_ptr()); let adapter = WintunOpenAdapter(wide_name.as_ptr());
@@ -94,7 +94,7 @@ impl TunInterface {
let packet_ptr = *packet_ptr_ptr; let packet_ptr = *packet_ptr_ptr;
std::ptr::copy_nonoverlapping(buf.as_ptr(), packet_ptr, buf.len()); std::ptr::copy_nonoverlapping(buf.as_ptr(), packet_ptr, buf.len());
if WintunSendPacket(self.tx_ring, &mut packet_ptr_ptr) { if WintunSendPacket(self.tx_ring, packet_ptr_ptr) {
Ok(buf.len()) Ok(buf.len())
} else { } else {
Err(io::Error::new(io::ErrorKind::Other, "Failed to send packet")) Err(io::Error::new(io::ErrorKind::Other, "Failed to send packet"))