4 Commits
Author SHA1 Message Date
jkortis 15b00db451 fix: resolve coordinator module and OsString compilation errors
Build and Release Windows Client / build (push) Failing after 39s
2026-09-30 23:55:00 -04:00
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
jkortis d9e9441b40 fix: resolve missing noise module and transport syntax error
Build and Release Windows Client / build (push) Failing after 35s
2026-09-30 23:50:21 -04:00
5 changed files with 26 additions and 6 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>,
+18
View File
@@ -11,6 +11,24 @@ mod noise;
mod transport; mod transport;
mod tun; mod tun;
pub mod coordinator {
pub mod coordinator_client {
// This is a placeholder for the generated gRPC code
pub struct GeneratedCoordinatorClient<T>(T);
impl GeneratedCoordinatorClient<tonic::transport::Channel> {
pub async fn connect(addr: String) -> Result<Self, tonic::transport::Error> {
Ok(Self(tonic::transport::Channel::from_shared(addr).unwrap()))
}
}
}
pub struct RegisterRequest { pub network_key: String, pub node_id: String, pub public_key: String, pub local_ip: String }
pub struct RegisterResponse { pub virtual_ip: String, pub session_token: String }
pub struct HeartbeatRequest { pub node_id: String, pub session_token: String, pub public_endpoint: String }
pub struct HeartbeatResponse { pub session_token: String }
pub struct PeerRequest { pub target_node_id: String, pub session_token: String }
pub struct PeerResponse { pub endpoint: String }
}
use coordinator_client::CoordinatorClient; use coordinator_client::CoordinatorClient;
use transport::{Transport, Packet}; use transport::{Transport, Packet};
use tun::TunInterface; use tun::TunInterface;
+1 -1
View File
@@ -123,7 +123,7 @@ impl Transport {
pub fn local_addr(&self) -> SocketAddr { pub fn local_addr(&self) -> SocketAddr {
self.socket.local_addr().expect("Failed to get local address") self.socket.local_addr().expect("Failed to get local address")
} }
}
/// Mock encryption functions to demonstrate where they would be integrated /// Mock encryption functions to demonstrate where they would be integrated
async fn encrypt(_data: &[u8], _addr: SocketAddr) -> Vec<u8> { async fn encrypt(_data: &[u8], _addr: SocketAddr) -> Vec<u8> {
+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> = 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"))