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

Migration changes
All checks were successful
gitea/Frida/pipeline/head This commit looks good
Details

Browse Source 
modified:   src/client.rs
	modified:   src/server.rs
This commit is contained in:
Michael Wain 2024-11-14 03:25:54 +03:00
parent f1365c5200
commit ef3697eb22
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client.rs
View File

@ -13,7 +13,7 @@ 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};
use tun2::{DeviceReader, DeviceWriter}; use tun::{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, ()>;
@ -343,7 +343,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 = tun2::Configuration::default(); let mut config = tun::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 +361,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 = tun2::create_as_async(&config).unwrap(); let dev = tun::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");

4
src/server.rs
View File

@ -85,13 +85,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 = tun2::Configuration::default(); let mut config = tun::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 = tun2::create_as_async(&config).unwrap(); let dev = tun::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();