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

Autofixed warnings

Browse Source 
modified:   Cargo.lock
	modified:   Cargo.toml
	modified:   src/client.rs
	modified:   src/udp.rs
This commit is contained in:
Michael Wain 2024-11-13 01:38:33 +03:00
parent 64d8601fff
commit 25db097e6d
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -1552,7 +1552,7 @@ checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
[[package]] [[package]]
name = "frida_vpn" name = "frida_vpn"
version = "0.1.5" version = "0.1.6"
dependencies = [ dependencies = [
"aes-gcm", "aes-gcm",
"base64 0.22.1", "base64 0.22.1",

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "frida_vpn" name = "frida_vpn"
version = "0.1.5" version = "0.1.6"
edition = "2021" edition = "2021"
license = "Apache-2.0" license = "Apache-2.0"
authors = ["alterdekim"] authors = ["alterdekim"]

16
src/client.rs
View File

@ -1,21 +1,19 @@
use crossbeam_channel::unbounded;
use socket2::SockAddr;
pub mod general { pub mod general {
use crate::config::ClientConfiguration; use crate::config::ClientConfiguration;
use tokio_util::sync::CancellationToken; 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 log::{error, info, warn};
use aes_gcm::{ use aes_gcm::{
aead::{Aead, AeadCore, KeyInit, OsRng}, aead::{Aead, AeadCore, KeyInit, OsRng},
Aes256Gcm, Nonce}; Aes256Gcm, Nonce};
use base64::prelude::*; use base64::prelude::*;
use std::{fmt::Error, io::Read, pin, sync::Arc}; use std::{io::Read, sync::Arc};
use std::net::Ipv4Addr; use std::net::Ipv4Addr;
use std::pin::pin;
use x25519_dalek::{PublicKey, StaticSecret}; use x25519_dalek::{PublicKey, StaticSecret};
use crate::udp::{UDPVpnPacket, UDPVpnHandshake, UDPSerializable}; use crate::udp::{UDPVpnPacket, UDPVpnHandshake, UDPSerializable};
use tun2::{AbstractDevice, AsyncDevice, Configuration, DeviceReader, DeviceWriter}; use tun2::{AbstractDevice, DeviceReader, DeviceWriter};
trait ReadWrapper { trait ReadWrapper {
async fn read(&mut self, buf: &mut [u8]) -> Result<usize, ()>; async fn read(&mut self, buf: &mut [u8]) -> Result<usize, ()>;
@ -277,11 +275,11 @@ pub mod android {
pub mod desktop { pub mod desktop {
use crate::client::general::{CoreVpnClient, DevReader, DevWriter, VpnClient}; use crate::client::general::{CoreVpnClient, DevReader, DevWriter, VpnClient};
use crate::config::ClientConfiguration; use crate::config::ClientConfiguration;
use log::{error, info, warn}; use log::{error, info};
use network_interface::{NetworkInterface, NetworkInterfaceConfig}; use network_interface::{NetworkInterface, NetworkInterfaceConfig};
use tokio::{io::BufReader, net::UdpSocket}; use tokio::net::UdpSocket;
use std::process::Command; use std::process::Command;
use std::{io::{Read, Write}, net::SocketAddr}; use std::net::SocketAddr;
fn configure_routes(endpoint_ip: &str, s_interface: Option<String>) { fn configure_routes(endpoint_ip: &str, s_interface: Option<String>) {
let interfaces = NetworkInterface::show().unwrap(); let interfaces = NetworkInterface::show().unwrap();

1
src/udp.rs
View File

@ -1,7 +1,6 @@
use std::net::Ipv4Addr; use std::net::Ipv4Addr;
use chrono::{Timelike, Utc}; use chrono::{Timelike, Utc};
use rand::Rng;
pub struct UDPVpnPacket { pub struct UDPVpnPacket {
pub nonce: Vec<u8>, // [u8; 12] pub nonce: Vec<u8>, // [u8; 12]