chore(deps): bump clap from 4.5.45 to 4.5.49

Bumps [clap](https://github.com/clap-rs/clap) from 4.5.45 to 4.5.49.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.45...clap_complete-v4.5.49)

---
updated-dependencies:
- dependency-name: clap
  dependency-version: 4.5.49
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.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

Cargo.lock

@@ -135,18 +135,18 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "clap"
-version = "4.5.45"
+version = "4.5.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc0e74a703892159f5ae7d3aac52c8e6c392f5ae5f359c70b5881d60aaac318"
+checksum = "f4512b90fa68d3a9932cea5184017c5d200f5921df706d45e853537dea51508f"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.44"
+version = "4.5.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3e7f4214277f3c7aa526a59dd3fbe306a370daee1f8b7b8c987069cd8e888a8"
+checksum = "0025e98baa12e766c67ba13ff4695a887a1eba19569aad00a472546795bd6730"
 dependencies = [
  "anstream",
  "anstyle",
@@ -253,7 +253,7 @@ dependencies = [
 
 [[package]]
 name = "fake-tcp"
-version = "0.7.0"
+version = "0.7.1"
 dependencies = [
  "bytes",
  "flume",
@@ -585,7 +585,7 @@ dependencies = [
 
 [[package]]
 name = "phantun"
-version = "0.8.0"
+version = "0.8.1"
 dependencies = [
  "clap",
  "fake-tcp",

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
 

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

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}
 }
 

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"

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

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"

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

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)> {
+) -> std::io::Result<(usize, SocketAddr, IpAddr)> {
-    use std::os::unix::io::AsRawFd;
-    use tokio::io::Interest;
-    use nix::sys::socket::cmsg_space;
-
     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),
+            Some(&mut control_message_buffer),
-            nix::sys::socket::MsgFlags::empty(),
+            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 }
+}