github/dndx-phantun
1
0
Fork 0
mirror of https://github.com/dndx/phantun.git synced 2025-11-26 22:55:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removes unsafes and unwraps, sets default tcp connections to 1

Browse Source
This commit is contained in:
Saber Haj Rabiee
2022-12-12 00:58:10 -08:00
parent ea9b6575fc
commit 13dfdaac98
5 changed files with 95 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
phantun/src/bin/client.rs
View File

@@ -20,6 +20,9 @@ use phantun::UDP_TTL;
async fn main() -> io::Result<()> {
pretty_env_logger::init();
let num_cpus = num_cpus::get();
info!("{} cores available", num_cpus);
let matches = Command::new("Phantun Client")
.version(crate_version!())
.author("Datong Sun (github.com/dndx)")
@@ -72,7 +75,7 @@ async fn main() -> io::Result<()> {
.required(false)
.help("Only use IPv4 address when connecting to remote")
.action(ArgAction::SetTrue)
.conflicts_with_all(&["tun_local6", "tun_peer6"]),
.conflicts_with_all(["tun_local6", "tun_peer6"]),
)
.arg(
Arg::new("tun_local6")
@@ -108,7 +111,7 @@ async fn main() -> io::Result<()> {
.required(false)
.value_name("number")
.help("Number of TCP connections per each client.")
.default_value("8")
.default_value("1")
)
.arg(
Arg::new("udp_connections")
@@ -116,8 +119,8 @@ async fn main() -> io::Result<()> {
.required(false)
.value_name("number")
.help("Number of UDP connections per each client.")
.default_value("8")
)
.default_value(num_cpus.to_string())
)
.arg(
Arg::new("encryption")
.long("encryption")
@@ -202,9 +205,6 @@ async fn main() -> io::Result<()> {
.transpose()?,
);
let num_cpus = num_cpus::get();
info!("{} cores available", num_cpus);
let tun = TunBuilder::new()
.name(tun_name) // if name is empty, then it is set by kernel.
.tap(false) // false (default): TUN, true: TAP.
@@ -313,7 +313,7 @@ async fn main() -> io::Result<()> {
match res {
Some(size) => {
let udp_sock_index = udp_sock_index.fetch_add(1, Ordering::Relaxed) % udp_socks_amount;
let udp_sock = unsafe { udp_socks.get_unchecked(udp_sock_index) };
let udp_sock = udp_socks[udp_sock_index].clone();
if let Some(ref enc) = *encryption {
enc.decrypt(&mut buf_tcp[..size]);
}
@@ -360,7 +360,7 @@ async fn main() -> io::Result<()> {
match res {
Ok(size) => {
let tcp_sock_index = tcp_sock_index.fetch_add(1, Ordering::Relaxed) % tcp_socks_amount;
let tcp_sock = unsafe { tcp_socks.get_unchecked(tcp_sock_index) };
let tcp_sock = tcp_socks[tcp_sock_index].clone();
if let Some(ref enc) = *encryption {
enc.encrypt(&mut buf_udp[..size]);
}

12
phantun/src/bin/server.rs
View File

@@ -20,6 +20,9 @@ use phantun::UDP_TTL;
async fn main() -> io::Result<()> {
pretty_env_logger::init();
let num_cpus = num_cpus::get();
info!("{} cores available", num_cpus);
let matches = Command::new("Phantun Server")
.version(crate_version!())
.author("Datong Sun (github.com/dndx)")
@@ -72,7 +75,7 @@ async fn main() -> io::Result<()> {
.required(false)
.help("Do not assign IPv6 addresses to Tun interface")
.action(ArgAction::SetTrue)
.conflicts_with_all(&["tun_local6", "tun_peer6"]),
.conflicts_with_all(["tun_local6", "tun_peer6"]),
)
.arg(
Arg::new("tun_local6")
@@ -117,7 +120,7 @@ async fn main() -> io::Result<()> {
.required(false)
.value_name("number")
.help("Number of UDP connections per each TCP connections.")
.default_value("8")
.default_value(num_cpus.to_string())
)
.get_matches();
@@ -179,9 +182,6 @@ async fn main() -> io::Result<()> {
.map(fs::read)
.transpose()?;
let num_cpus = num_cpus::get();
info!("{} cores available", num_cpus);
let tun = TunBuilder::new()
.name(tun_name) // if name is empty, then it is set by kernel.
.tap(false) // false (default): TUN, true: TAP.
@@ -312,7 +312,7 @@ async fn main() -> io::Result<()> {
match res {
Some(size) => {
udp_sock_index = (udp_sock_index + 1) % udp_socks_amount;
let udp_sock = unsafe { udp_socks.get_unchecked(udp_sock_index) };
let udp_sock = udp_socks[udp_sock_index].clone();
if let Some(ref enc) = *encryption {
enc.decrypt(&mut buf_tcp[..size]);
}

11
phantun/src/lib.rs
View File

@@ -1,6 +1,5 @@
use fake_tcp::packet::MAX_PACKET_LEN;
use std::convert::From;
use std::iter;
use std::time::Duration;
pub mod utils;
@@ -33,12 +32,12 @@ impl From<&str> for Encryption {
if input.len() < 2 {
panic!("xor key should be provided");
} else {
return Self::Xor(
iter::repeat(input[1])
.take((MAX_PACKET_LEN as f32 / input[1].len() as f32).ceil() as usize)
.collect::<String>()[..MAX_PACKET_LEN]
Self::Xor(
input[1]
.repeat((MAX_PACKET_LEN as f32 / input[1].len() as f32).ceil() as usize)
[..MAX_PACKET_LEN]
.into(),
);
)
}
}
_ => {