chore(deps): bump tokio from 1.47.1 to 1.48.0

Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.47.1 to 1.48.0. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.47.1...tokio-1.48.0) --- updated-dependencies: - dependency-name: tokio dependency-version: 1.48.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
fix(docker): fix parameter parsing and signal handling in phantun.sh (#235 )
2025-10-16 02:35:35 +08:00 · 2025-10-15 08:03:42 +00:00 · 2025-10-06 09:29:18 -07:00 · 2025-10-06 09:25:21 -07:00 · 2025-08-25 22:39:04 +08:00 · 2025-08-22 21:02:30 -07:00
10 changed files with 65 additions and 111 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -64,7 +64,7 @@ jobs:
          - mipsel-unknown-linux-musl

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
      - uses: actions-rs/toolchain@v1
        with:
          toolchain: nightly
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,21 +2,6 @@
 # It is not intended for manual editing.
 version = 4

-[[package]]
-name = "addr2line"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler2"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
-
 [[package]]
 name = "aho-corasick"
 version = "1.1.3"
@@ -82,21 +67,6 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"

-[[package]]
-name = "backtrace"
-version = "0.3.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
-dependencies = [
- "addr2line",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "bitflags"
 version = "2.9.3"
@@ -253,7 +223,7 @@ dependencies = [

 [[package]]
 name = "fake-tcp"
-version = "0.7.0"
+version = "0.7.1"
 dependencies = [
 "bytes",
 "flume",
@@ -332,12 +302,6 @@ dependencies = [
 "syn",
 ]

-[[package]]
-name = "gimli"
-version = "0.31.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
-
 [[package]]
 name = "glob"
 version = "0.3.3"
@@ -368,17 +332,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc6d6206008e25125b1f97fbe5d309eb7b85141cf9199d52dbd3729a1584dd16"

-[[package]]
-name = "io-uring"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b"
-dependencies = [
- "bitflags",
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "ipnetwork"
 version = "0.20.0"
@@ -452,15 +405,6 @@ dependencies = [
 "autocfg",
 ]

-[[package]]
-name = "miniz_oxide"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
-dependencies = [
- "adler2",
-]
-
 [[package]]
 name = "mio"
 version = "1.0.4"
@@ -539,15 +483,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "object"
-version = "0.36.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.21.3"
@@ -585,7 +520,7 @@ dependencies = [

 [[package]]
 name = "phantun"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
 "clap",
 "fake-tcp",
@@ -829,12 +764,6 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"

-[[package]]
-name = "rustc-demangle"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -870,12 +799,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "slab"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
-
 [[package]]
 name = "smallvec"
 version = "1.15.1"
@@ -949,29 +872,26 @@ dependencies = [

 [[package]]
 name = "tokio"
-version = "1.47.1"
+version = "1.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
 dependencies = [
- "backtrace",
 "bytes",
- "io-uring",
 "libc",
 "mio",
 "parking_lot",
 "pin-project-lite",
 "signal-hook-registry",
- "slab",
 "socket2",
 "tokio-macros",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]

 [[package]]
 name = "tokio-macros"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1124,6 +1044,12 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"

+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
 [[package]]
 name = "windows-sys"
 version = "0.59.0"
@@ -1142,6 +1068,15 @@ dependencies = [
 "windows-targets 0.53.3",
 ]

+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.52.6"
@@ -1164,7 +1099,7 @@ version = "0.53.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
 dependencies = [
- "windows-link",
+ "windows-link 0.1.3",
 "windows_aarch64_gnullvm 0.53.0",
 "windows_aarch64_msvc 0.53.0",
 "windows_i686_gnu 0.53.0",
--- a/README.md
+++ b/README.md
@@ -5,8 +5,7 @@ A lightweight and fast UDP to TCP obfuscator.
 ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/dndx/phantun/rust.yml)
 ![docs.rs](https://img.shields.io/docsrs/fake-tcp)

-Table of Contents
-=================
+# Table of Contents

 * [Phantun](#phantun)
 * [Latest release](#latest-release)
@@ -35,7 +34,14 @@ Table of Contents

 # Latest release

-[v0.7.0](https://github.com/dndx/phantun/releases/tag/v0.7.0)
+[v0.8.1](https://github.com/dndx/phantun/releases/tag/v0.8.1)
+
+<details>
+  <summary>MIPS architecture support for Phantun</summary>
+
+  [Rust only provides Tier 3 supports for MIPS based platforms](https://github.com/rust-lang/compiler-team/issues/648)
+since 2023. Phantun's MIPS build are therefore built using nightly Rust toolchain and provided on a best effort basis only.
+</details>

 # Overview

--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -25,6 +25,10 @@ FROM debian:latest
 COPY --from=builder /usr/local/bin/phantun-server /usr/local/bin/
 COPY --from=builder /usr/local/bin/phantun-client /usr/local/bin/
 COPY docker/phantun.sh /usr/local/bin/
+RUN apt-get update && apt-get install -y \
+    iproute2 \
+    iptables \
+    procps

 ENV USE_IPTABLES_NFT_BACKEND=0
 ENV RUST_LOG=INFO
--- a/docker/phantun.sh
+++ b/docker/phantun.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash

 # alias settings must be global, and must be defined before the function being called with the alias
 if [ "$USE_IPTABLES_NFT_BACKEND" = 1 ]; then
@@ -70,17 +70,17 @@ _is_ipv4_only() {
 }

 _get_tun_from_args() {
-  local tun=$(echo "$@" | awk -F '--tun' '{print $2}' | awk '{print $1}')
+  local tun=$(echo "$@" | awk -F '--tun ' '{print $2}' | awk '{print $1}')
  echo ${tun:=tun0}
 }

 _get_peer_from_args() {
-  local peer=$(echo "$@" | awk -F '--tun-peer' '{print $2}' | awk '{print $1}')
+  local peer=$(echo "$@" | awk -F '--tun-peer ' '{print $2}' | awk '{print $1}')
  _is_server_mode "$1" && echo ${peer:=192.168.201.2} || echo ${peer:=192.168.200.2}
 }

 _get_peer6_from_args() {
-  local peer=$(echo "$@" | awk -F '--tun-peer6' '{print $2}' | awk '{print $1}')
+  local peer=$(echo "$@" | awk -F '--tun-peer6 ' '{print $2}' | awk '{print $1}')
  _is_server_mode "$1" && echo ${peer:=fcc9::2} || echo ${peer:=fcc8::2}
 }

--- a/fake-tcp/Cargo.toml
+++ b/fake-tcp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fake-tcp"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2024"
 authors = ["Datong Sun <dndx@idndx.com>"]
 license = "MIT OR Apache-2.0"
--- a/fake-tcp/README.md
+++ b/fake-tcp/README.md
@@ -5,7 +5,7 @@ packet oriented tunneling with minimum overhead.

 ## License

-Copyright 2021 Datong Sun <dndx@idndx.com>
+Copyright 2021-2025 Datong Sun <dndx@idndx.com>

 Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)> or the MIT license
--- a/phantun/Cargo.toml
+++ b/phantun/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "phantun"
-version = "0.8.0"
+version = "0.8.1"
 edition = "2024"
 authors = ["Datong Sun <dndx@idndx.com>"]
 license = "MIT OR Apache-2.0"
--- a/phantun/README.md
+++ b/phantun/README.md
@@ -4,7 +4,7 @@ Client/Server crate, see [Phantun Project README.md](https://github.com/dndx/pha

 ## License

-Copyright 2021 Datong Sun <dndx@idndx.com>
+Copyright 2021-2025 Datong Sun <dndx@idndx.com>

 Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)> or the MIT license
--- a/phantun/src/utils.rs
+++ b/phantun/src/utils.rs
@@ -10,8 +10,12 @@ use neli::{
    types::RtBuffer,
    utils::Groups,
 };
-use nix::sys::socket::{CmsgIterator, ControlMessageOwned, SockaddrLike as _};
+use nix::sys::socket::{
+    CmsgIterator, ControlMessageOwned, MsgFlags, SockaddrLike, SockaddrStorage, cmsg_space,
+};
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
+use std::os::unix::io::AsRawFd;
+use tokio::io::Interest;
 use tokio::net::UdpSocket;

 pub fn new_udp_reuseport(local_addr: SocketAddr) -> UdpSocket {
@@ -49,26 +53,26 @@ pub fn new_udp_reuseport(local_addr: SocketAddr) -> UdpSocket {
    udp_sock.try_into().unwrap()
 }

+/// Similiar to `UdpSocket::recv_from()`, but returns a 3rd value `IPAddr`
+/// which corresponds to where the UDP datagram was destined to, this is useful
+/// for disambigous when socket can receive on multiple IP address
+/// or interfaces.
 pub async fn udp_recv_pktinfo(
    sock: &UdpSocket,
    buf: &mut [u8],
-) -> std::io::Result<(usize, std::net::SocketAddr, std::net::IpAddr)> {
-    use std::os::unix::io::AsRawFd;
-    use tokio::io::Interest;
-    use nix::sys::socket::cmsg_space;
-
+) -> std::io::Result<(usize, SocketAddr, IpAddr)> {
    sock.async_io(Interest::READABLE, || {
-        let control_buffer_size = std::cmp::max(
+        const CONTROL_MESSAGE_BUFFER_SIZE: usize = max_usize(
            cmsg_space::<nix::libc::in_pktinfo>(),
            cmsg_space::<nix::libc::in6_pktinfo>(),
        );
-        let mut control_buffer = vec![0u8; control_buffer_size];
+        let mut control_message_buffer = [0u8; CONTROL_MESSAGE_BUFFER_SIZE];
        let iov = &mut [std::io::IoSliceMut::new(buf)];
-        let res = nix::sys::socket::recvmsg::<nix::sys::socket::SockaddrStorage>(
+        let res = nix::sys::socket::recvmsg::<SockaddrStorage>(
            sock.as_raw_fd(),
            iov,
-            Some(&mut control_buffer),
-            nix::sys::socket::MsgFlags::empty(),
+            Some(&mut control_message_buffer),
+            MsgFlags::empty(),
        )?;

        let src_addr = res.address.expect("missing source address");
@@ -104,6 +108,7 @@ fn dst_addr_from_cmsgs(cmsgs: CmsgIterator) -> Option<IpAddr> {
            return Some(Ipv6Addr::from(pktinfo.ipi6_addr.s6_addr).into());
        }
    }
+
    None
 }

@@ -144,3 +149,7 @@ pub fn assign_ipv6_address(device_name: &str, local: Ipv6Addr, peer: Ipv6Addr) {
        .unwrap();
    rtnl.send(&nl_header).unwrap();
 }
+
+const fn max_usize(a: usize, b: usize) -> usize {
+    if a > b { a } else { b }
+}
Author	SHA1	Message	Date
dependabot[bot]	2dcbd45d34	chore(deps): bump tokio from 1.47.1 to 1.48.0 Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.47.1 to 1.48.0. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.47.1...tokio-1.48.0) --- updated-dependencies: - dependency-name: tokio dependency-version: 1.48.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-15 08:03:42 +00:00
Heng lu	7f7da10b1b	fix(docker): fix parameter parsing and signal handling in phantun.sh (#235 ) All checks were successful Docker image build / build (push) Successful in 5m48s Details Rust / build (push) Successful in 4m6s Details - Fix awk delimiter parsing for --tun, --tun-peer, --tun-peer6 arguments - Change shebang from sh to bash to fix signal trap handling - Add missing dependencies (iproute2, iptables, procps) to Dockerfile	2025-10-06 09:29:18 -07:00
WGH	9d74a6bfeb	style(phantun): calculate `cmsg` buffer size statically Closes #178 and supersedes #225.	2025-10-06 09:25:21 -07:00
dependabot[bot]	9bdfd76819	chore(deps): bump actions/checkout from 4 to 5 Some checks failed Docker image build / build (push) Has been cancelled Details Rust / build (push) Has been cancelled Details Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-08-25 22:39:04 +08:00
Datong Sun	d1c18c64f3	docs(readme): bump latest release to `0.8.1` Some checks failed Docker image build / build (push) Has been cancelled Details Rust / build (push) Has been cancelled Details	2025-08-22 21:02:30 -07:00
Datong Sun	b42ed82147	docs(readme): bump copyright year	2025-08-22 20:55:13 -07:00
Datong Sun	7c3864a3ed	chore(cargo): bump `fake-tcp` to `0.7.1` and `phantun` to `0.8.1`	2025-08-22 20:54:22 -07:00
Datong Sun	6a39e9e9d0	perf(phantun): avoid heap allocation with `udp_recv_from_pktinfo()`	2025-08-23 11:53:41 +08:00
Datong Sun	cedee0c699	docs(readme): release `0.8.0` and add note about MIPS build Some checks are pending Docker image build / build (push) Waiting to run Details Rust / build (push) Waiting to run Details	2025-08-23 01:20:53 +08:00