From 25db097e6d872925e4a5e320442a58c708a7d1bc Mon Sep 17 00:00:00 2001 From: alterdekim Date: Wed, 13 Nov 2024 01:38:33 +0300 Subject: [PATCH] Autofixed warnings modified: Cargo.lock modified: Cargo.toml modified: src/client.rs modified: src/udp.rs --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/client.rs | 16 +++++++--------- src/udp.rs | 1 - 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c26722f..beac500 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1552,7 +1552,7 @@ checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] name = "frida_vpn" -version = "0.1.5" +version = "0.1.6" dependencies = [ "aes-gcm", "base64 0.22.1", diff --git a/Cargo.toml b/Cargo.toml index 96fb57d..ed8ba92 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "frida_vpn" -version = "0.1.5" +version = "0.1.6" edition = "2021" license = "Apache-2.0" authors = ["alterdekim"] diff --git a/src/client.rs b/src/client.rs index 4e86027..eabfaf2 100644 --- a/src/client.rs +++ b/src/client.rs @@ -1,21 +1,19 @@ -use crossbeam_channel::unbounded; -use socket2::SockAddr; pub mod general { use crate::config::ClientConfiguration; use tokio_util::sync::CancellationToken; - use tokio::{net::UdpSocket, sync::{Mutex, mpsc}, io::{BufReader, BufWriter, AsyncWriteExt, AsyncReadExt, AsyncRead, AsyncWrite}, fs::File}; + use tokio::{net::UdpSocket, sync::{Mutex, mpsc}, io::{AsyncWriteExt, AsyncReadExt}, fs::File}; use log::{error, info, warn}; use aes_gcm::{ aead::{Aead, AeadCore, KeyInit, OsRng}, Aes256Gcm, Nonce}; use base64::prelude::*; - use std::{fmt::Error, io::Read, pin, sync::Arc}; + use std::{io::Read, sync::Arc}; use std::net::Ipv4Addr; - use std::pin::pin; + use x25519_dalek::{PublicKey, StaticSecret}; use crate::udp::{UDPVpnPacket, UDPVpnHandshake, UDPSerializable}; - use tun2::{AbstractDevice, AsyncDevice, Configuration, DeviceReader, DeviceWriter}; + use tun2::{AbstractDevice, DeviceReader, DeviceWriter}; trait ReadWrapper { async fn read(&mut self, buf: &mut [u8]) -> Result; @@ -277,11 +275,11 @@ pub mod android { pub mod desktop { use crate::client::general::{CoreVpnClient, DevReader, DevWriter, VpnClient}; use crate::config::ClientConfiguration; - use log::{error, info, warn}; + use log::{error, info}; use network_interface::{NetworkInterface, NetworkInterfaceConfig}; - use tokio::{io::BufReader, net::UdpSocket}; + use tokio::net::UdpSocket; use std::process::Command; - use std::{io::{Read, Write}, net::SocketAddr}; + use std::net::SocketAddr; fn configure_routes(endpoint_ip: &str, s_interface: Option) { let interfaces = NetworkInterface::show().unwrap(); diff --git a/src/udp.rs b/src/udp.rs index 84dde6e..3aa15d8 100644 --- a/src/udp.rs +++ b/src/udp.rs @@ -1,7 +1,6 @@ use std::net::Ipv4Addr; use chrono::{Timelike, Utc}; -use rand::Rng; pub struct UDPVpnPacket { pub nonce: Vec, // [u8; 12]