bug fixes

Cargo.toml

@@ -28,14 +28,26 @@ rayon = "1.10.0"
 readonly = "0.2.13"
 sha2 = "0.10.9"
 smol = "2.0.2"
-tappers = "0.4.2"
+
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["winsock2", "mswsock", "minwindef"] }
+tappers = { version = "0.4.2", features = ["wintun"] }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"
+tappers = "0.4.2"
 
+[target.x86_64-pc-windows-gnu]
+linker = "/usr/bin/x86_64-w64-mingw32-gcc"
+ar = "/usr/bin/x86_64-w64-mingw32-ar"
+
+[target.i686-pc-windows-gnu]
+linker = "/usr/bin/i686-w64-mingw32-gcc"
+ar = "/usr/bin/i686-w64-mingw32-ar"
+
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
 
 [features]
 no-timeout = []

README.md

@@ -0,0 +1,21 @@
+# Pea 2 Pea  
+very simple P2P VPN(Virtual Network yes, Private maybe),  
+this program is intended to help you play LAN games over internet and as proof of concept  
+when all clients are behind Full-cone NAT, does not work with clients behind Symmetric NAT  
+at least for now  
+
+
+> [!WARNING]  
+> Piercing NAT may fail based on network configuration
+
+## how to run  
+> install rustc and cargo or rustup, you will need 2024 edition  
+> build using  
+> ```bash
+> # to build
+> cargo build --release
+> # to run server(registrar)
+> ./target/release/server
+> # to run client
+> sudo ./target/release/client -r SERVER_IP -n NETWORK_ID -P PASSWORD # password is optional
+> ```

src/client/main.rs

@@ -21,7 +21,8 @@ use crate::types::Network;
 struct Cli {
     #[arg(short = 'r', long = "registrar")]
     #[arg(help = "registrar ip address or hostname")]
-    registrar: String,
+    #[arg(required_unless_present = "version")]
+    registrar: Option<String>,
 
     #[arg(short = 'p', long = "registrar-port")]
     #[arg(help = format!("optional Port number for the registrar service (1-65535) Default: {}", SERVER_PORT))]
@@ -29,7 +30,8 @@ struct Cli {
 
     #[arg(short = 'n', long = "network-id")]
     #[arg(help = "your virtual network id that allows other people to connect to you")]
-    network_id: String,
+    #[arg(required_unless_present = "version")]
+    network_id: Option<String>,
 
     #[arg(short = 'P', long = "password")]
     #[arg(
@@ -52,14 +54,24 @@ struct Cli {
     symmetric_nat_bypass_mode: bool,
 }
 
+fn print_version() {
+    println!("Pea 2 Pea {}", VERSION);
+}
+
 fn main() -> std::io::Result<()> {
     let cli = <Cli as clap::Parser>::parse();
-    if cli.network_id.len() > 0xff {
+    if cli.version {
+        print_version();
+        exit(0);
+    }
+    let network_id = cli.network_id.unwrap();
+    let registrar = cli.registrar.unwrap();
+    if network_id.len() > 0xff {
         eprintln!("network id cannot have more then 255 charactes");
         exit(7); // posix for E2BIG
     }
     let mut buf: [u8; UDP_BUFFER_SIZE] = [0; UDP_BUFFER_SIZE];
-    let (socket, virtual_network, my_public_sock_addr) = {
+    let (socket, virtual_network, _my_public_sock_addr) = {
         let socket: Arc<UdpSocket> = Arc::new(|| -> std::io::Result<UdpSocket> {
             match UdpSocket::bind("0.0.0.0:0") {
                 // bind to OS assigned random port
@@ -81,11 +93,11 @@ fn main() -> std::io::Result<()> {
         })();
 
         #[allow(non_snake_case)] // i think this is valid snake case but rustc doesnt think so
-        let server_SocketAddr: core::net::SocketAddr = format!("{}:{}", cli.registrar, server_port)
+        let server_SocketAddr: core::net::SocketAddr = format!("{}:{}", registrar, server_port)
             .parse()
             .expect(&format!(
                 "{}:{} is invalid sock addr",
-                cli.registrar, server_port
+                registrar, server_port
             ));
 
         // query here
@@ -134,7 +146,7 @@ fn main() -> std::io::Result<()> {
                 &mut buf,
                 &server_SocketAddr,
                 &socket,
-                &cli.network_id,
+                &network_id,
                 &cli.password,
             ) {
                 Ok(n) => {
@@ -146,7 +158,7 @@ fn main() -> std::io::Result<()> {
                     let _ = net::send_heartbeat(
                         &mut buf,
                         &server_SocketAddr,
-                        &socket,
+                        socket.clone(),
                         &n,
                         &public_sock_addr,
                         &iv,
@@ -161,7 +173,7 @@ fn main() -> std::io::Result<()> {
                             None => false,
                         },
                         encryption_key,
-                        cli.network_id,
+                        network_id,
                         salt,
                         Vec::with_capacity(1),
                     );
@@ -174,6 +186,17 @@ fn main() -> std::io::Result<()> {
                         &iv,
                     )
                     .unwrap();
+
+                    let _ = net::send_heartbeat(
+                        // send heart beat to start periodic heart beat
+                        &mut buf,
+                        &server_SocketAddr,
+                        socket.clone(),
+                        &tmp_v_net,
+                        &public_sock_addr,
+                        &iv,
+                    );
+
                     tmp_v_net
                 }
                 Err(e) => {
@@ -222,12 +245,13 @@ fn main() -> std::io::Result<()> {
                 "{} packets away!, awiting a bit for NAT mappings to estabilish",
                 "[LOG]".blue()
             );
-            std::thread::sleep(Duration::from_millis(200));
+            std::thread::sleep(Duration::from_millis(2000));
-
+            for _ in 0..STANDARD_RETRY_MAX {
                 match net::P2P_query(&mut buf, &peer.sock_addr, &socket, encrypted, key) {
                     Ok(ip) => {
                         ips_used[ip.octets()[3] as usize] = true;
                         peer.private_ip = ip;
+                        break;
                     }
                     Err(e) => {
                         eprintln!(
@@ -236,6 +260,8 @@ fn main() -> std::io::Result<()> {
                             peer.sock_addr,
                             e
                         );
+                        std::thread::sleep(Duration::from_millis(2000));
+                    }
                 }
             }
         });
@@ -304,6 +330,7 @@ fn main() -> std::io::Result<()> {
     } // just let me have my thread
 
     smol::block_on(async {
+        println!("{} listener started!", "[LOG]".blue());
         loop {
             buf.fill(0);
             match socket.recv_from(&mut buf) {

src/client/net.rs

@@ -255,7 +255,7 @@ pub fn get_request(
 pub fn send_heartbeat(
     buf: &mut [u8; UDP_BUFFER_SIZE],
     dst: &SocketAddr,
-    socket: &UdpSocket,
+    socket: Arc<std::net::UdpSocket>,
     network: &types::Network,
     my_public_sock_addr: &Box<[u8]>,
     iv: &[u8; BLOCK_SIZE as usize],
@@ -300,7 +300,16 @@ pub fn send_heartbeat(
             .collect::<String>(),
     );
 
-    match send_and_recv_with_retry(buf, &send_buf, dst, socket, STANDARD_RETRY_MAX) {
+    {
+        let sock_clone = socket.clone();
+        let send_buf_clone: Box<[u8]> = send_buf.clone();
+        let dst_clone: SocketAddr = dst.clone();
+        std::thread::spawn(move || {
+            periodic_heart_beat(sock_clone, send_buf_clone, dst_clone);
+        });
+    }
+
+    match send_and_recv_with_retry(buf, &send_buf, dst, &socket, STANDARD_RETRY_MAX) {
         Ok((data_lenght, _)) => return Ok(data_lenght),
         Err(e) => return Err(e),
     }
@@ -718,6 +727,9 @@ pub async fn handle_incoming_connection(
                 "[SUCCESS]".green()
             );
         }
+        x if x == ServerMethods::HEARTBEAT as u8 => {
+            println!("{} heart beat recive confirmed", "[OK]".green());
+        }
         _ => {
             eprintln!(
                 "{} unknown method ID: 0x{:02x}, Droping!",
@@ -727,3 +739,25 @@ pub async fn handle_incoming_connection(
         }
     }
 }
+
+pub fn periodic_heart_beat(socket: Arc<UdpSocket>, send_buf: Box<[u8]>, dst: SocketAddr) {
+    println!("{} periodic heartbeat started", "[LOG]".blue());
+    loop {
+        std::thread::sleep(std::time::Duration::from_secs(30));
+        println!("{} sending heartbeat to server", "[LOG]".blue());
+
+        match socket.send_to(&send_buf, dst) {
+            Ok(size) => {
+                #[cfg(debug_assertions)]
+                println!("send {} bytes", size);
+            }
+            Err(e) => {
+                eprintln!(
+                    "{} failed to send heartbeat to server Error: {}",
+                    "[ERROR]".red(),
+                    e
+                );
+            }
+        }
+    }
+}

src/client/tun.rs

@@ -1,9 +1,9 @@
-use std::sync::{Arc, RwLock};
-
 use pea_2_pea::*;
 use rand::RngCore;
 use rayon::prelude::*;
 use sha2::Digest;
+use std::sync::{Arc, RwLock};
+use tappers::Interface;
 
 use crate::types::Network;
 
@@ -11,15 +11,36 @@ pub fn create_tun_interface(
     private_ip: std::net::Ipv4Addr,
     if_name: Option<String>,
 ) -> Result<tappers::Tun, std::io::Error> {
-    let mut tun_iface: tappers::Tun = tappers::Tun::new_named(tappers::Interface::new(
+    #[cfg(not(target_os = "windows"))]
-        if_name.unwrap_or("pea0".to_owned()),
+    let mut tun_iface: tappers::Tun = tappers::Tun::new_named(Interface::new(
+        &if_name.unwrap_or(DEFAULT_INTERFACE_NAME.to_owned()),
     )?)?;
+    #[cfg(target_os = "windows")]
+    let mut tun_iface: tappers::Tun = tappers::Tun::new()?;
+    #[cfg(not(target_os = "windows"))]
+    {
         let mut addr_req = tappers::AddAddressV4::new(private_ip);
         addr_req.set_netmask(24);
         let mut broadcast_addr_oct = private_ip.octets();
         broadcast_addr_oct[3] = 255;
         addr_req.set_broadcast(std::net::Ipv4Addr::from(broadcast_addr_oct));
         tun_iface.add_addr(addr_req)?;
+    }
+    #[cfg(target_os = "windows")]
+    std::process::Command::new("netsh").args([
+        "interface",
+        "ipv4",
+        "set",
+        "address",
+        &format!(
+            "name=\"{}\"",
+            tun_iface.name()?.name().into_string().unwrap()
+        ),
+        "static",
+        &private_ip.to_string(),
+        "255.255.255.0",
+    ]);
+
     tun_iface.set_up()?;
     return Ok(tun_iface);
 }
@@ -37,7 +58,7 @@ pub fn read_tun_iface(
         loop {
             let data_lenght = tun_iface.recv(&mut buf).unwrap(); // build in auto termination, isn't it great
             smol::spawn(handle_ip_packet(
-                buf[..data_lenght - 1].to_vec().into(),
+                buf[..data_lenght].to_vec().into(),
                 network.clone(),
                 socket.clone(),
             ))
@@ -84,22 +105,25 @@ pub async fn handle_ip_packet(
     let mut iv: [u8; BLOCK_SIZE] = [0u8; BLOCK_SIZE];
     rng.fill_bytes(&mut iv);
 
-    let mut encrypted_data =
+    let mut procesed_data: Vec<u8> = if network.read().unwrap().encrypted {
         match shared::crypto::encrypt(&network.read().unwrap().key, &iv, &packet_data) {
             Ok(cr) => cr,
             Err(e) => {
                 eprintln!("Failed to encrypt packet droping it: {}", e);
                 return;
             }
+        }
+    } else {
+        packet_data.to_vec()
     };
 
-    encrypted_data.insert(0, P2PMethods::PACKET as u8);
+    procesed_data.insert(0, P2PMethods::PACKET as u8);
-    encrypted_data.splice(1..1, iv);
+    procesed_data.splice(1..1, iv);
 
     if dst_ip.octets()[3] == 255 {
         network.read().unwrap().peers.par_iter().for_each(|peer| {
             // broadcast
-            match socket.send_to(&encrypted_data, peer.sock_addr) {
+            match socket.send_to(&procesed_data, peer.sock_addr) {
                 Ok(_) => {}
                 Err(e) => eprintln!("failed to send packet: {}", e),
             };
@@ -117,7 +141,7 @@ pub async fn handle_ip_packet(
             None => return,
         };
 
-        match socket.send_to(&encrypted_data, dst) {
+        match socket.send_to(&procesed_data, dst) {
             Ok(_) => {}
             Err(e) => eprintln!("failed to send packet: {}", e),
         };

src/lib.rs

@@ -4,7 +4,7 @@ pub const SERVER_PORT: u16 = 3543;
 pub const UDP_BUFFER_SIZE: usize = 65527;
 pub const IP_BUFFER_SIZE: usize = 65535;
 pub const DEFAULT_TIMEOUT: u64 = 30;
-pub const VERSION: &str = "v0.1";
+pub const VERSION: &str = "v1.1.1";
 pub const BLOCK_SIZE: usize = 16;
 pub const STANDARD_RETRY_MAX: usize = 10;
 
@@ -15,6 +15,8 @@ pub const MAPPING_SHOT_COUNT: u8 = 5;
 
 pub const DEFAULT_NETWORK_PREFIX: [u8; 3] = [172, 22, 44];
 
+pub const DEFAULT_INTERFACE_NAME: &str = "pea0";
+
 #[repr(u8)]
 #[allow(non_camel_case_types)]
 pub enum ServerMethods {

src/server/main.rs

@@ -2,10 +2,7 @@ mod net;
 mod types;
 mod utils;
 use smol::net::UdpSocket;
-use std::{
+use std::{process::exit, sync::Arc};
-    process::exit,
-    sync::{Arc, RwLock},
-};
 
 use orx_concurrent_vec::ConcurrentVec;
 fn main() -> std::io::Result<()> {
@@ -21,6 +18,13 @@ fn main() -> std::io::Result<()> {
         let registration_vector: Arc<ConcurrentVec<types::Registration>> =
             Arc::new(orx_concurrent_vec::ConcurrentVec::new());
 
+        {
+            let reg_clone = registration_vector.clone();
+            std::thread::spawn(move || {
+                utils::disconnected_cleaner(reg_clone);
+            });
+        }
+
         let mut buf: [u8; pea_2_pea::UDP_BUFFER_SIZE] = [0u8; pea_2_pea::UDP_BUFFER_SIZE];
         smol::block_on(async {
             loop {

src/server/net.rs

@@ -64,7 +64,7 @@ pub async fn handle_request(
 
             let registration = match registration_vector
                 .iter()
-                .find(|elem| elem.map(|s| &s.net_id == &net_id)) // find if id exists
+                .find(|elem| elem.map(|s| &s.net_id == &net_id && !s.invalid)) // find if id exists
             {
                 Some(registration) => registration,
                 None => {futures::executor::block_on(send_with_count(socket, &src ,&[ServerResponse::ID_DOESNT_EXIST as u8]));
@@ -163,7 +163,7 @@ pub async fn handle_request(
 
             match registration_vector
                 .iter()
-                .find(|elem| elem.map(|s| &s.net_id == &net_id)) // find if id exists
+                .find(|elem| elem.map(|s| &s.net_id == &net_id && !s.invalid)) // find if id exists
             {
                 Some(_) => {
                         futures::executor::block_on(send_with_count(socket, &src, &[ServerResponse::ID_EXISTS as u8]));
@@ -216,7 +216,25 @@ pub async fn handle_request(
                     .collect::<String>(),
             );
 
-            registration_vector.push(types::Registration::new(
+            let mut first_invalid_registration: Option<usize> = None;
+
+            for (i, reg) in registration_vector.iter().enumerate() {
+                if reg.map(|r| r.invalid) {
+                    first_invalid_registration = Some(i);
+                    break;
+                }
+            }
+            match first_invalid_registration {
+                Some(i) => registration_vector[i].update(|r|{*r = types::Registration::new(
+                net_id.clone(),
+                client_sock_addr.clone(),
+                encrypted,
+                chrono::Utc::now().timestamp(),
+                salt,
+                iv,
+                src
+            );}),
+                None => {registration_vector.push(types::Registration::new(
                 net_id,
                 client_sock_addr,
                 encrypted,
@@ -224,7 +242,9 @@ pub async fn handle_request(
                 salt,
                 iv,
                 src
-            ));
+            ));},
+            };
+
             send_with_count(socket, &src, &[ServerMethods::REGISTER as u8]).await;
             #[cfg(debug_assertions)]
             println!("network registered");

src/server/types.rs

@@ -1,5 +1,4 @@
 use pea_2_pea::*;
-use std::sync::{Arc, atomic::Ordering};
 
 #[derive(Clone)]
 #[readonly::make]
@@ -41,6 +40,7 @@ pub struct Registration {
     pub encrypted: bool,
     #[readonly]
     pub salt: [u8; BLOCK_SIZE as usize],
+    pub invalid: bool,
 }
 
 impl Registration {
@@ -64,64 +64,7 @@ impl Registration {
             encrypted,
             last_heart_beat: heart_beat,
             salt: salt.unwrap_or([0; BLOCK_SIZE as usize]),
+            invalid: false,
         }
     }
 }
-
-pub struct BatchLock {
-    inner: std::sync::Mutex<bool>, // true = blocking new locks
-    condvar: std::sync::Condvar,
-    active_count: std::sync::atomic::AtomicUsize,
-}
-
-pub struct LockGuard {
-    lock: Arc<BatchLock>,
-}
-
-impl BatchLock {
-    pub fn new() -> Arc<Self> {
-        Arc::new(BatchLock {
-            inner: std::sync::Mutex::new(false),
-            condvar: std::sync::Condvar::new(),
-            active_count: std::sync::atomic::AtomicUsize::new(0),
-        })
-    }
-
-    // Acquire a lock (blocks if waiting for all to unlock)
-    pub fn lock(self: &Arc<Self>) -> LockGuard {
-        let mut blocking = self.inner.lock().unwrap();
-
-        // Wait while new locks are blocked
-        while *blocking {
-            blocking = self.condvar.wait(blocking).unwrap();
-        }
-
-        self.active_count.fetch_add(1, Ordering::SeqCst);
-
-        LockGuard {
-            lock: Arc::clone(self),
-        }
-    }
-
-    // Block new locks and wait for all current locks to finish
-    pub fn wait_all_unlock(self: &Arc<Self>) {
-        // Block new locks
-        *self.inner.lock().unwrap() = true;
-
-        // Wait for all active locks to finish
-        while self.active_count.load(Ordering::SeqCst) > 0 {
-            std::thread::sleep(std::time::Duration::from_millis(1));
-        }
-
-        // Allow new locks again
-        *self.inner.lock().unwrap() = false;
-        self.condvar.notify_all();
-    }
-}
-
-impl Drop for LockGuard {
-    fn drop(&mut self) {
-        // Automatically release lock when guard is dropped
-        self.lock.active_count.fetch_sub(1, Ordering::SeqCst);
-    }
-}

src/server/utils.rs

@@ -1,4 +1,6 @@
+use colored::Colorize;
 use pea_2_pea::*;
+
 pub fn send_general_error_to_client<T: std::error::Error>(
     dst: core::net::SocketAddr,
     e: T,
@@ -11,3 +13,23 @@ pub fn send_general_error_to_client<T: std::error::Error>(
 
     let _ = socket.send_to(&[ServerResponse::GENERAL_ERROR as u8], dst);
 }
+
+pub fn disconnected_cleaner(
+    registration_vector: std::sync::Arc<
+        orx_concurrent_vec::ConcurrentVec<crate::types::Registration>,
+    >,
+) {
+    loop {
+        std::thread::sleep(std::time::Duration::from_secs(120));
+        println!("{} starting cleanup", "[LOG]".blue());
+        let time_now = chrono::Utc::now().timestamp();
+        unsafe {
+            registration_vector.iter_mut().for_each(|reg| {
+                reg.clients.retain(|c| time_now - c.last_heart_beat < 120);
+                if time_now - reg.last_heart_beat > 120 {
+                    reg.invalid = true;
+                }
+            })
+        }
+    }
+}