alterwain/Frida
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trying to avoid AlreadyExists error.

Browse Source 
modified:   src/client.rs
	modified:   src/server.rs
This commit is contained in:
Michael Wain 2024-11-17 22:56:48 +03:00
parent 34f3548d66
commit d9d71f3ef1
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/client.rs
View File

@ -13,8 +13,13 @@ pub mod general {
use x25519_dalek::{PublicKey, StaticSecret}; use x25519_dalek::{PublicKey, StaticSecret};
use crate::udp::{UDPVpnPacket, UDPVpnHandshake, UDPSerializable}; use crate::udp::{UDPVpnPacket, UDPVpnHandshake, UDPSerializable};
#[cfg(not(target_os = "linux"))]
use tun::{DeviceReader, DeviceWriter}; use tun::{DeviceReader, DeviceWriter};
#[cfg(target_os = "linux")]
use tun2::{DeviceReader, DeviceWriter};
pub trait ReadWrapper { pub trait ReadWrapper {
async fn read(&mut self, buf: &mut [u8]) -> Result<usize, ()>; async fn read(&mut self, buf: &mut [u8]) -> Result<usize, ()>;
} }
@ -277,6 +282,12 @@ pub mod desktop {
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
use network_interface::{NetworkInterface, NetworkInterfaceConfig}; use network_interface::{NetworkInterface, NetworkInterfaceConfig};
#[cfg(target_os = "linux")]
use tun2::{ Configuration, create_as_async };
#[cfg(not(target_os = "linux"))]
use tun::{ Configuration, create_as_async };
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
fn configure_routes(endpoint_ip: &str, s_interface: Option<String>) { fn configure_routes(endpoint_ip: &str, s_interface: Option<String>) {
@ -343,7 +354,7 @@ pub mod desktop {
impl VpnClient for DesktopClient { impl VpnClient for DesktopClient {
async fn start(&self) { async fn start(&self) {
info!("s_interface: {:?}", &self.s_interface); info!("s_interface: {:?}", &self.s_interface);
let mut config = tun::Configuration::default(); let mut config = Configuration::default();
config.address(&self.client_config.client.address) config.address(&self.client_config.client.address)
.netmask("255.255.255.255") .netmask("255.255.255.255")
.destination(&self.client_config.client.address) .destination(&self.client_config.client.address)
@ -361,7 +372,7 @@ pub mod desktop {
sock.connect(&self.client_config.server.endpoint).await.unwrap(); sock.connect(&self.client_config.server.endpoint).await.unwrap();
info!("AsyncDevice"); info!("AsyncDevice");
let dev = tun::create_as_async(&config).unwrap(); let dev = create_as_async(&config).unwrap();
info!("Split device"); info!("Split device");
let (dev_writer, dev_reader) = dev.split().unwrap(); let (dev_writer, dev_reader) = dev.split().unwrap();
info!("CoreVpnClient"); info!("CoreVpnClient");

10
src/server.rs
View File

@ -10,6 +10,12 @@ use std::collections::HashMap;
use aes_gcm::{ aead::{Aead, AeadCore, KeyInit, OsRng}, use aes_gcm::{ aead::{Aead, AeadCore, KeyInit, OsRng},
Aes256Gcm, Nonce }; Aes256Gcm, Nonce };
#[cfg(target_os = "linux")]
use tun2::{Configuration, create_as_async};
#[cfg(not(target_os = "linux"))]
use tun::{Configuration, create_as_async};
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
use network_interface::{NetworkInterface, NetworkInterfaceConfig}; use network_interface::{NetworkInterface, NetworkInterfaceConfig};
@ -85,13 +91,13 @@ fn configure_routes(s_interface: Option<&str>) {
pub async fn server_mode(server_config: ServerConfiguration, s_interface: Option<&str>) { pub async fn server_mode(server_config: ServerConfiguration, s_interface: Option<&str>) {
info!("Starting server..."); info!("Starting server...");
let mut config = tun::Configuration::default(); let mut config = Configuration::default();
config.address(&server_config.interface.internal_address) config.address(&server_config.interface.internal_address)
.netmask("255.255.255.0") .netmask("255.255.255.0")
.tun_name("tun0") .tun_name("tun0")
.up(); .up();
let dev = tun::create_as_async(&config).unwrap(); let dev = create_as_async(&config).unwrap();
let (mut dev_writer, mut dev_reader) = dev.into_framed().split(); let (mut dev_writer, mut dev_reader) = dev.into_framed().split();
let sock = UdpSocket::bind(&server_config.interface.bind_address).await.unwrap(); let sock = UdpSocket::bind(&server_config.interface.bind_address).await.unwrap();