Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
20935d2380 | ||
|
|
727d8c41ca | ||
|
|
d9e9441b40 | ||
|
|
94c7e590fb | ||
|
|
ba4aad6a74 | ||
|
|
98c1311101 |
No files matched your search
@@ -8,47 +8,52 @@ on:
|
||||
jobs:
|
||||
build:
|
||||
runs-on: windows-latest
|
||||
defaults:
|
||||
run:
|
||||
shell: powershell
|
||||
|
||||
steps:
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install Rust
|
||||
shell: pwsh
|
||||
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
|
||||
}
|
||||
# Append to GITHUB_PATH for subsequent steps
|
||||
Add-Content -Path $env:GITHUB_PATH -Value $installDir
|
||||
|
||||
- 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
|
||||
shell: pwsh
|
||||
run: |
|
||||
# Manually ensure cargo is in path for this specific shell session
|
||||
Set-ExecutionPolicy Bypass -Scope Process -Force
|
||||
$env:Path = "$env:USERPROFILE\.cargo\bin;" + $env:Path
|
||||
cd client
|
||||
cargo build --release
|
||||
|
||||
- name: Prepare Binaries for Installer
|
||||
shell: pwsh
|
||||
run: |
|
||||
Set-ExecutionPolicy Bypass -Scope Process -Force
|
||||
New-Item -ItemType Directory -Force -Path bin
|
||||
Copy-Item "client\target\release\meshvpn-client.exe" "bin\client.exe"
|
||||
Invoke-WebRequest -Uri "https://github.com/WireGuard/wintun/releases/latest/download/wintun.dll" -OutFile "bin\wintun.dll"
|
||||
|
||||
- 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
|
||||
shell: pwsh
|
||||
run: |
|
||||
# Add WiX bin to path (common choco install path)
|
||||
Set-ExecutionPolicy Bypass -Scope Process -Force
|
||||
$env:Path += ";C:\Program Files (x86)\WiX Toolset v3\bin"
|
||||
candle.exe installer\product.wxs -o installer\product.wixobj
|
||||
light.exe installer\product.wixobj -o meshvpn-client.msi
|
||||
|
||||
@@ -9,6 +9,8 @@ bytes = "1"
|
||||
tonic = "0.12"
|
||||
prost = "0.13"
|
||||
crossbeam-queue = "0.3"
|
||||
hex = "0.4"
|
||||
snow = "0.9"
|
||||
|
||||
[profile.release]
|
||||
opt-level = "z"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use tonic::{Request, Response, Status};
|
||||
use coordinator::coordinator_client::CoordinatorClient as GeneratedCoordinatorClient;
|
||||
use coordinator::{RegisterRequest, RegisterResponse, HeartbeatRequest, HeartbeatResponse, PeerRequest, PeerResponse};
|
||||
use crate::coordinator::coordinator_client::CoordinatorClient as GeneratedCoordinatorClient;
|
||||
use crate::coordinator::{RegisterRequest, RegisterResponse, HeartbeatRequest, HeartbeatResponse, PeerRequest, PeerResponse};
|
||||
|
||||
pub struct CoordinatorClient {
|
||||
client: GeneratedCoordinatorClient<tonic::transport::Channel>,
|
||||
|
||||
@@ -123,7 +123,7 @@ impl Transport {
|
||||
pub fn local_addr(&self) -> SocketAddr {
|
||||
self.socket.local_addr().expect("Failed to get local address")
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// Mock encryption functions to demonstrate where they would be integrated
|
||||
async fn encrypt(_data: &[u8], _addr: SocketAddr) -> Vec<u8> {
|
||||
|
||||
+3
-3
@@ -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::ptr::{null_mut};
|
||||
use std::io::{self, Read, Write};
|
||||
@@ -42,7 +42,7 @@ unsafe impl Sync for TunInterface {}
|
||||
|
||||
impl TunInterface {
|
||||
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 {
|
||||
let adapter = WintunOpenAdapter(wide_name.as_ptr());
|
||||
@@ -94,7 +94,7 @@ impl TunInterface {
|
||||
let packet_ptr = *packet_ptr_ptr;
|
||||
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())
|
||||
} else {
|
||||
Err(io::Error::new(io::ErrorKind::Other, "Failed to send packet"))
|
||||
|
||||
Reference in new issue
Block a user