From 7220b72b399611bf82a8bfcb0708cc230adfb3a1 Mon Sep 17 00:00:00 2001 From: Luca Ferrarotti Date: Sun, 14 May 2023 15:29:00 +0200 Subject: [PATCH 1/4] Enable date and time via logging --- fake-tcp/Cargo.toml | 14 +++++++------- phantun/Cargo.toml | 19 ++++++++++--------- phantun/src/bin/client.rs | 28 +++++++++++++++++++++++++++- phantun/src/bin/server.rs | 28 +++++++++++++++++++++++++++- 4 files changed, 71 insertions(+), 18 deletions(-) diff --git a/fake-tcp/Cargo.toml b/fake-tcp/Cargo.toml index 43c4196..3c8e651 100644 --- a/fake-tcp/Cargo.toml +++ b/fake-tcp/Cargo.toml @@ -15,11 +15,11 @@ packet oriented tunneling with minimum overhead. benchmark = [] [dependencies] -bytes = "1" -pnet = "0.33" -tokio = { version = "1.14", features = ["full"] } -rand = { version = "0.8", features = ["small_rng"] } -log = "0.4" -internet-checksum = "0.2" +bytes = "1.4.0" +pnet = "0.33.0" +tokio = { version = "1.28.0", features = ["full"] } +rand = { version = "0.8.5", features = ["small_rng"] } +log = "0.4.17" +internet-checksum = "0.2.1" tokio-tun = "0.7" -flume = "0.10" +flume = "0.10.14" diff --git a/phantun/Cargo.toml b/phantun/Cargo.toml index 94ea726..0b5e487 100644 --- a/phantun/Cargo.toml +++ b/phantun/Cargo.toml @@ -11,14 +11,15 @@ Transforms UDP stream into (fake) TCP streams that can go through Layer 3 & Layer 4 (NAPT) firewalls/NATs. """ [dependencies] -clap = { version = "4.0", features = ["cargo"] } -socket2 = { version = "0.5", features = ["all"] } +clap = { version = "4.2.5", features = ["cargo"] } +socket2 = { version = "0.5.2", features = ["all"] } fake-tcp = { path = "../fake-tcp", version = "0.5" } -tokio = { version = "1.14", features = ["full"] } -tokio-util = "0.7" -log = "0.4" -pretty_env_logger = "0.4" +tokio = { version = "1.28.0", features = ["full"] } +tokio-util = "0.7.8" +log = "0.4.17" +env_logger = "0.10.0" +chrono = "0.4.24" tokio-tun = "0.7" -num_cpus = "1.13" -neli = "0.6" -nix = "0.26" +num_cpus = "1.15.0" +neli = "0.6.4" +nix = "0.26.2" diff --git a/phantun/src/bin/client.rs b/phantun/src/bin/client.rs index 360101e..33e8394 100644 --- a/phantun/src/bin/client.rs +++ b/phantun/src/bin/client.rs @@ -2,6 +2,12 @@ use clap::{crate_version, Arg, ArgAction, Command}; use fake_tcp::packet::MAX_PACKET_LEN; use fake_tcp::{Socket, Stack}; use log::{debug, error, info}; +use chrono::Local; +use log::LevelFilter; +use std::io::Write; +use env_logger::fmt::Color; +use Color::{Blue, Cyan, Green, Red, Yellow}; +use log::Level; use phantun::utils::{assign_ipv6_address, new_udp_reuseport}; use std::collections::HashMap; use std::fs; @@ -17,7 +23,27 @@ use phantun::UDP_TTL; #[tokio::main] async fn main() -> io::Result<()> { - pretty_env_logger::init(); + env_logger::Builder::new() + .format(|buf, record| { + let mut level_style = buf.style(); + match record.level() { + Level::Trace => level_style.set_color(Cyan), + Level::Debug => level_style.set_color(Blue), + Level::Info => level_style.set_color(Green), + Level::Warn => level_style.set_color(Yellow), + Level::Error => level_style.set_color(Red).set_bold(true), + }; + writeln!(buf, + "[{} {} {}] {}", + Local::now().format("%d-%m-%Y %H:%M:%S"), + level_style.value(record.level()), + //record.level(), + record.target(), + record.args() + ) + }) + .filter(None, LevelFilter::Info) + .init(); let matches = Command::new("Phantun Client") .version(crate_version!()) diff --git a/phantun/src/bin/server.rs b/phantun/src/bin/server.rs index c5dfeea..5eac967 100644 --- a/phantun/src/bin/server.rs +++ b/phantun/src/bin/server.rs @@ -2,6 +2,12 @@ use clap::{crate_version, Arg, ArgAction, Command}; use fake_tcp::packet::MAX_PACKET_LEN; use fake_tcp::Stack; use log::{debug, error, info}; +use chrono::Local; +use log::LevelFilter; +use std::io::Write; +use env_logger::fmt::Color; +use Color::{Blue, Cyan, Green, Red, Yellow}; +use log::Level; use phantun::utils::{assign_ipv6_address, new_udp_reuseport}; use std::fs; use std::io; @@ -17,7 +23,27 @@ use phantun::UDP_TTL; #[tokio::main] async fn main() -> io::Result<()> { - pretty_env_logger::init(); + env_logger::Builder::new() + .format(|buf, record| { + let mut level_style = buf.style(); + match record.level() { + Level::Trace => level_style.set_color(Cyan), + Level::Debug => level_style.set_color(Blue), + Level::Info => level_style.set_color(Green), + Level::Warn => level_style.set_color(Yellow), + Level::Error => level_style.set_color(Red).set_bold(true), + }; + writeln!(buf, + "[{} {} {}] {}", + Local::now().format("%d-%m-%Y %H:%M:%S"), + level_style.value(record.level()), + //record.level(), + record.target(), + record.args() + ) + }) + .filter(None, LevelFilter::Info) + .init(); let matches = Command::new("Phantun Server") .version(crate_version!()) From 422a465d6e089b24346765732f1ccd2ffc54c6f0 Mon Sep 17 00:00:00 2001 From: Luca Ferrarotti Date: Sun, 14 May 2023 15:33:13 +0200 Subject: [PATCH 2/4] Remoce not more necessary rem code --- phantun/src/bin/client.rs | 1 - phantun/src/bin/server.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/phantun/src/bin/client.rs b/phantun/src/bin/client.rs index 33e8394..42fbfed 100644 --- a/phantun/src/bin/client.rs +++ b/phantun/src/bin/client.rs @@ -37,7 +37,6 @@ async fn main() -> io::Result<()> { "[{} {} {}] {}", Local::now().format("%d-%m-%Y %H:%M:%S"), level_style.value(record.level()), - //record.level(), record.target(), record.args() ) diff --git a/phantun/src/bin/server.rs b/phantun/src/bin/server.rs index 5eac967..e5fcebb 100644 --- a/phantun/src/bin/server.rs +++ b/phantun/src/bin/server.rs @@ -37,7 +37,6 @@ async fn main() -> io::Result<()> { "[{} {} {}] {}", Local::now().format("%d-%m-%Y %H:%M:%S"), level_style.value(record.level()), - //record.level(), record.target(), record.args() ) From 1fea277103fe2a50b9a6ee74fc2ebb825b615c4d Mon Sep 17 00:00:00 2001 From: Luca Ferrarotti Date: Sat, 14 Oct 2023 14:14:36 +0200 Subject: [PATCH 3/4] Some adaption and alligned to the source code from dndx --- .github/workflows/docker.yml | 8 ++++---- .github/workflows/release.yml | 2 +- .github/workflows/rust.yml | 2 +- Cargo.toml | 2 ++ fake-tcp/Cargo.toml | 8 ++++---- fake-tcp/src/lib.rs | 2 +- fake-tcp/src/packet.rs | 2 +- phantun/Cargo.toml | 10 +++++----- phantun/src/bin/client.rs | 2 +- phantun/src/bin/server.rs | 2 +- 10 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8989a10..ebcd451 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -11,18 +11,18 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: platforms: linux/amd64 - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Build Docker Image - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: docker/Dockerfile diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 22ecfba..e92166e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: - mipsel-unknown-linux-musl steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: toolchain: stable diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 2921282..8331676 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: toolchain: stable diff --git a/Cargo.toml b/Cargo.toml index 35a885f..4ab4671 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,7 @@ [workspace] +resolver = "2" + members = [ "fake-tcp", "phantun", diff --git a/fake-tcp/Cargo.toml b/fake-tcp/Cargo.toml index 3c8e651..8d94953 100644 --- a/fake-tcp/Cargo.toml +++ b/fake-tcp/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fake-tcp" -version = "0.5.0" +version = "0.5.5" edition = "2021" authors = ["Datong Sun "] license = "MIT OR Apache-2.0" @@ -16,10 +16,10 @@ benchmark = [] [dependencies] bytes = "1.4.0" -pnet = "0.33.0" +pnet = "0.34.0" tokio = { version = "1.28.0", features = ["full"] } rand = { version = "0.8.5", features = ["small_rng"] } log = "0.4.17" internet-checksum = "0.2.1" -tokio-tun = "0.7" -flume = "0.10.14" +tokio-tun = "0.9.1" +flume ="0.11.0" diff --git a/fake-tcp/src/lib.rs b/fake-tcp/src/lib.rs index a5c5863..a66da47 100644 --- a/fake-tcp/src/lib.rs +++ b/fake-tcp/src/lib.rs @@ -146,7 +146,7 @@ impl Socket { ) } - fn build_tcp_packet(&self, flags: u16, payload: Option<&[u8]>) -> Bytes { + fn build_tcp_packet(&self, flags: u8, payload: Option<&[u8]>) -> Bytes { let ack = self.ack.load(Ordering::Relaxed); self.last_ack.store(ack, Ordering::Relaxed); diff --git a/fake-tcp/src/packet.rs b/fake-tcp/src/packet.rs index c2abe56..349ffb7 100644 --- a/fake-tcp/src/packet.rs +++ b/fake-tcp/src/packet.rs @@ -36,7 +36,7 @@ pub fn build_tcp_packet( remote_addr: SocketAddr, seq: u32, ack: u32, - flags: u16, + flags: u8, payload: Option<&[u8]>, ) -> Bytes { let ip_header_len = match local_addr { diff --git a/phantun/Cargo.toml b/phantun/Cargo.toml index 0b5e487..a81ab26 100644 --- a/phantun/Cargo.toml +++ b/phantun/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "phantun" -version = "0.6.0" +version = "0.6.5" edition = "2021" authors = ["Datong Sun "] license = "MIT OR Apache-2.0" @@ -13,13 +13,13 @@ Layer 3 & Layer 4 (NAPT) firewalls/NATs. [dependencies] clap = { version = "4.2.5", features = ["cargo"] } socket2 = { version = "0.5.2", features = ["all"] } -fake-tcp = { path = "../fake-tcp", version = "0.5" } +fake-tcp = { path = "../fake-tcp", version = "0.5.5" } tokio = { version = "1.28.0", features = ["full"] } tokio-util = "0.7.8" log = "0.4.17" env_logger = "0.10.0" -chrono = "0.4.24" -tokio-tun = "0.7" +chrono = "0.4.24" +tokio-tun = "0.9.1" num_cpus = "1.15.0" neli = "0.6.4" -nix = "0.26.2" +nix = { version = "0.27.1", features = ["net"] } diff --git a/phantun/src/bin/client.rs b/phantun/src/bin/client.rs index 42fbfed..7c21f38 100644 --- a/phantun/src/bin/client.rs +++ b/phantun/src/bin/client.rs @@ -96,7 +96,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") diff --git a/phantun/src/bin/server.rs b/phantun/src/bin/server.rs index e5fcebb..c9e9b82 100644 --- a/phantun/src/bin/server.rs +++ b/phantun/src/bin/server.rs @@ -96,7 +96,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") From fa5fb88b04f4bf9bc8f90f895005176d53b71d1e Mon Sep 17 00:00:00 2001 From: Luca Ferrarotti Date: Sun, 7 Jan 2024 12:07:18 +0100 Subject: [PATCH 4/4] Updates the requirements on [tokio-tun] --- fake-tcp/Cargo.toml | 2 +- phantun/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fake-tcp/Cargo.toml b/fake-tcp/Cargo.toml index 8d94953..8a0b704 100644 --- a/fake-tcp/Cargo.toml +++ b/fake-tcp/Cargo.toml @@ -21,5 +21,5 @@ tokio = { version = "1.28.0", features = ["full"] } rand = { version = "0.8.5", features = ["small_rng"] } log = "0.4.17" internet-checksum = "0.2.1" -tokio-tun = "0.9.1" +tokio-tun = "0.11.2" flume ="0.11.0" diff --git a/phantun/Cargo.toml b/phantun/Cargo.toml index a81ab26..339f4f9 100644 --- a/phantun/Cargo.toml +++ b/phantun/Cargo.toml @@ -19,7 +19,7 @@ tokio-util = "0.7.8" log = "0.4.17" env_logger = "0.10.0" chrono = "0.4.24" -tokio-tun = "0.9.1" +tokio-tun = "0.11.2" num_cpus = "1.15.0" neli = "0.6.4" nix = { version = "0.27.1", features = ["net"] }