Compare commits

..

6 Commits
v0.8.0 ... main

Author SHA1 Message Date
dependabot[bot]
9bdfd76819 chore(deps): bump actions/checkout from 4 to 5
Some checks failed
Docker image build / build (push) Has been cancelled
Rust / build (push) Has been cancelled
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
Rust / build (push) Has been cancelled
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
Rust / build (push) Waiting to run
2025-08-23 01:20:53 +08:00
8 changed files with 37 additions and 24 deletions

View File

@ -64,7 +64,7 @@ jobs:
- mipsel-unknown-linux-musl - mipsel-unknown-linux-musl
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v5
- uses: actions-rs/toolchain@v1 - uses: actions-rs/toolchain@v1
with: with:
toolchain: nightly toolchain: nightly

4
Cargo.lock generated
View File

@ -253,7 +253,7 @@ dependencies = [
[[package]] [[package]]
name = "fake-tcp" name = "fake-tcp"
version = "0.7.0" version = "0.7.1"
dependencies = [ dependencies = [
"bytes", "bytes",
"flume", "flume",
@ -585,7 +585,7 @@ dependencies = [
[[package]] [[package]]
name = "phantun" name = "phantun"
version = "0.8.0" version = "0.8.1"
dependencies = [ dependencies = [
"clap", "clap",
"fake-tcp", "fake-tcp",

View File

@ -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) ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/dndx/phantun/rust.yml)
![docs.rs](https://img.shields.io/docsrs/fake-tcp) ![docs.rs](https://img.shields.io/docsrs/fake-tcp)
Table of Contents # Table of Contents
=================
* [Phantun](#phantun) * [Phantun](#phantun)
* [Latest release](#latest-release) * [Latest release](#latest-release)
@ -35,7 +34,14 @@ Table of Contents
# Latest release # 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 # Overview

View File

@ -1,6 +1,6 @@
[package] [package]
name = "fake-tcp" name = "fake-tcp"
version = "0.7.0" version = "0.7.1"
edition = "2024" edition = "2024"
authors = ["Datong Sun <dndx@idndx.com>"] authors = ["Datong Sun <dndx@idndx.com>"]
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"

View File

@ -5,7 +5,7 @@ packet oriented tunneling with minimum overhead.
## License ## 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 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 [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)> or the MIT license

View File

@ -1,6 +1,6 @@
[package] [package]
name = "phantun" name = "phantun"
version = "0.8.0" version = "0.8.1"
edition = "2024" edition = "2024"
authors = ["Datong Sun <dndx@idndx.com>"] authors = ["Datong Sun <dndx@idndx.com>"]
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"

View File

@ -4,7 +4,7 @@ Client/Server crate, see [Phantun Project README.md](https://github.com/dndx/pha
## License ## 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 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 [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)> or the MIT license

View File

@ -10,8 +10,12 @@ use neli::{
types::RtBuffer, types::RtBuffer,
utils::Groups, 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::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
use std::os::unix::io::AsRawFd;
use tokio::io::Interest;
use tokio::net::UdpSocket; use tokio::net::UdpSocket;
pub fn new_udp_reuseport(local_addr: SocketAddr) -> UdpSocket { pub fn new_udp_reuseport(local_addr: SocketAddr) -> UdpSocket {
@ -49,26 +53,28 @@ pub fn new_udp_reuseport(local_addr: SocketAddr) -> UdpSocket {
udp_sock.try_into().unwrap() 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( pub async fn udp_recv_pktinfo(
sock: &UdpSocket, sock: &UdpSocket,
buf: &mut [u8], 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, || { sock.async_io(Interest::READABLE, || {
let control_buffer_size = std::cmp::max( // according to documented struct definition in RFC 3542,
cmsg_space::<nix::libc::in_pktinfo>(), // sizeof(in6_pktinfo) should always be larger than sizeof(in_pktinfo),
cmsg_space::<nix::libc::in6_pktinfo>(), // this assert just double checks that. The goal is to avoid
); // a heap allocation with Vec at runtime.
let mut control_buffer = vec![0u8; control_buffer_size]; assert!(cmsg_space::<nix::libc::in6_pktinfo>() >= cmsg_space::<nix::libc::in_pktinfo>());
let mut control_message_buffer = [0u8; cmsg_space::<nix::libc::in6_pktinfo>()];
let iov = &mut [std::io::IoSliceMut::new(buf)]; 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(), sock.as_raw_fd(),
iov, 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"); let src_addr = res.address.expect("missing source address");
@ -104,6 +110,7 @@ fn dst_addr_from_cmsgs(cmsgs: CmsgIterator) -> Option<IpAddr> {
return Some(Ipv6Addr::from(pktinfo.ipi6_addr.s6_addr).into()); return Some(Ipv6Addr::from(pktinfo.ipi6_addr.s6_addr).into());
} }
} }
None None
} }