Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2eea6af625 | ||
|
|
15b00db451 | ||
|
|
20935d2380 | ||
|
|
727d8c41ca | ||
|
|
d9e9441b40 | ||
|
|
94c7e590fb | ||
|
|
ba4aad6a74 | ||
|
|
98c1311101 | ||
|
|
01ed5a3924 | ||
|
|
50f2774ffb |
No files matched your search
+31
-15
@@ -8,39 +8,55 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
|
defaults:
|
||||||
|
run:
|
||||||
|
shell: powershell
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Install Rust toolchain
|
- name: Install Rust
|
||||||
uses: dtolnay/rust-toolchain@stable
|
run: |
|
||||||
|
Set-ExecutionPolicy Bypass -Scope Process -Force
|
||||||
|
$installDir = "$env:USERPROFILE\.cargo\bin"
|
||||||
|
if (-not (Test-Path $installDir)) {
|
||||||
|
Invoke-WebRequest -Uri "https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe" -OutFile "rustup-init.exe"
|
||||||
|
.\rustup-init.exe -y --default-toolchain stable
|
||||||
|
}
|
||||||
|
Add-Content -Path $env:GITHUB_PATH -Value $installDir
|
||||||
|
|
||||||
- name: Install LLVM
|
- name: Install LLVM
|
||||||
run: choco install llvm --no-progress
|
run: |
|
||||||
|
Set-ExecutionPolicy Bypass -Scope Process -Force
|
||||||
|
# Use -y to automatically accept all scripts and licenses
|
||||||
|
choco install llvm -y --no-progress
|
||||||
|
|
||||||
- name: Build Client
|
- name: Build Client
|
||||||
working-directory: ./client
|
run: |
|
||||||
run: cargo build --release
|
Set-ExecutionPolicy Bypass -Scope Process -Force
|
||||||
|
$env:Path = "$env:USERPROFILE\.cargo\bin;" + $env:Path
|
||||||
|
cd client
|
||||||
|
cargo build --release
|
||||||
|
|
||||||
- name: Prepare Binaries for Installer
|
- name: Prepare Binaries for Installer
|
||||||
shell: pwsh
|
|
||||||
run: |
|
run: |
|
||||||
|
Set-ExecutionPolicy Bypass -Scope Process -Force
|
||||||
New-Item -ItemType Directory -Force -Path bin
|
New-Item -ItemType Directory -Force -Path bin
|
||||||
Copy-Item "client/target/release/meshvpn-client.exe" "bin/client.exe"
|
Copy-Item "client\target\release\meshvpn-client.exe" "bin\client.exe"
|
||||||
# Download Wintun.dll as it is a driver binary not stored in git
|
Invoke-WebRequest -Uri "https://github.com/WireGuard/wintun/releases/latest/download/wintun.dll" -OutFile "bin\wintun.dll"
|
||||||
Invoke-WebRequest -Uri "https://github.com/WireGuard/wintun/releases/latest/download/wintun.dll" -OutFile "bin/wintun.dll"
|
|
||||||
|
|
||||||
- name: Install WiX Toolset
|
- name: Install WiX Toolset
|
||||||
run: choco install wixtoolset --no-progress
|
run: |
|
||||||
|
Set-ExecutionPolicy Bypass -Scope Process -Force
|
||||||
|
choco install wixtoolset -y --no-progress
|
||||||
|
|
||||||
- name: Build MSI Installer
|
- name: Build MSI Installer
|
||||||
shell: pwsh
|
|
||||||
run: |
|
run: |
|
||||||
# candle.exe compiles .wxs to .wixobj
|
Set-ExecutionPolicy Bypass -Scope Process -Force
|
||||||
# light.exe links .wixobj to .msi
|
$env:Path += ";C:\Program Files (x86)\WiX Toolset v3\bin"
|
||||||
candle.exe installer/product.wxs -o installer/product.wixobj
|
candle.exe installer\product.wxs -o installer\product.wixobj
|
||||||
light.exe installer/product.wixobj -o meshvpn-client.msi
|
light.exe installer\product.wixobj -o meshvpn-client.msi
|
||||||
|
|
||||||
- name: Create Gitea Release
|
- name: Create Gitea Release
|
||||||
uses: softprops/action-gh-release@v1
|
uses: softprops/action-gh-release@v1
|
||||||
|
|||||||
@@ -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"
|
||||||
|
|||||||
@@ -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>,
|
||||||
|
|||||||
@@ -11,6 +11,27 @@ 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> {
|
||||||
|
let channel = tonic::transport::Endpoint::from_shared(addr)?
|
||||||
|
.connect()
|
||||||
|
.await?;
|
||||||
|
Ok(Self(channel))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
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, pub public_key: String }
|
||||||
|
}
|
||||||
|
|
||||||
use coordinator_client::CoordinatorClient;
|
use coordinator_client::CoordinatorClient;
|
||||||
use transport::{Transport, Packet};
|
use transport::{Transport, Packet};
|
||||||
use tun::TunInterface;
|
use tun::TunInterface;
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ impl Transport {
|
|||||||
let data = Bytes::copy_from_slice(&buf[..len]);
|
let data = Bytes::copy_from_slice(&buf[..len]);
|
||||||
|
|
||||||
match crypto::decapsulate(data) {
|
match crypto::decapsulate(data) {
|
||||||
Ok((header, payload, _hmac)) => {
|
Ok((_header, payload, _hmac)) => {
|
||||||
// In a real implementation, HMAC verification and decryption would happen here
|
// In a real implementation, HMAC verification and decryption would happen here
|
||||||
// if verify_hmac(&_hmac, &header, &payload) {
|
// if verify_hmac(&_hmac, &header, &payload) {
|
||||||
// let decrypted_data = decrypt(payload, addr).await;
|
// let decrypted_data = decrypt(payload, addr).await;
|
||||||
@@ -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> {
|
||||||
|
|||||||
+6
-7
@@ -1,8 +1,7 @@
|
|||||||
use std::ffi::{c_void, OSString, OsString};
|
use std::ffi::c_void;
|
||||||
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;
|
||||||
use std::sync::{Arc, Mutex};
|
|
||||||
|
|
||||||
/// Wintun API Constants
|
/// Wintun API Constants
|
||||||
const WINTUN_RING_BUFFER_SIZE: usize = 65536;
|
const WINTUN_RING_BUFFER_SIZE: usize = 65536;
|
||||||
@@ -42,7 +41,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());
|
||||||
@@ -85,7 +84,7 @@ impl TunInterface {
|
|||||||
pub fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
|
pub fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
|
||||||
unsafe {
|
unsafe {
|
||||||
let length = buf.len() as u32;
|
let length = buf.len() as u32;
|
||||||
let mut packet_ptr_ptr = WintunAllocateSendPacket(self.tx_ring, length);
|
let packet_ptr_ptr = WintunAllocateSendPacket(self.tx_ring, length);
|
||||||
|
|
||||||
if packet_ptr_ptr.is_null() {
|
if packet_ptr_ptr.is_null() {
|
||||||
return Err(io::Error::new(io::ErrorKind::Other, "Failed to allocate send packet"));
|
return Err(io::Error::new(io::ErrorKind::Other, "Failed to allocate send packet"));
|
||||||
@@ -94,7 +93,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"))
|
||||||
|
|||||||
Reference in new issue
Block a user