github/dndx-phantun
1
0
Fork 0
mirror of https://github.com/dndx/phantun.git synced 2025-01-31 12:19:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(phantun) add support for connecting to/from IPv6 based UDP endpoint

Browse Source
This commit is contained in:
Datong Sun 2021-10-30 09:02:28 -07:00
parent f667f56747
commit 042f5af49f
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,8 +16,17 @@ use tokio_tun::TunBuilder;
const UDP_TTL: Duration = Duration::from_secs(180); const UDP_TTL: Duration = Duration::from_secs(180);
fn new_udp_reuseport(addr: SocketAddrV4) -> UdpSocket { fn new_udp_reuseport(addr: SocketAddr) -> UdpSocket {
let udp_sock = socket2::Socket::new(socket2::Domain::IPV4, socket2::Type::DGRAM, None).unwrap(); let udp_sock = socket2::Socket::new(
if addr.is_ipv4() {
socket2::Domain::IPV4
} else {
socket2::Domain::IPV6
},
socket2::Type::DGRAM,
None,
)
.unwrap();
udp_sock.set_reuse_port(true).unwrap(); udp_sock.set_reuse_port(true).unwrap();
// from tokio-rs/mio/blob/master/src/sys/unix/net.rs // from tokio-rs/mio/blob/master/src/sys/unix/net.rs
udp_sock.set_cloexec(true).unwrap(); udp_sock.set_cloexec(true).unwrap();
@ -40,7 +49,7 @@ async fn main() {
.long("local") .long("local")
.required(true) .required(true)
.value_name("IP:PORT") .value_name("IP:PORT")
.help("Sets the IP and port where Phantun Client listens for incoming UDP datagrams") .help("Sets the IP and port where Phantun Client listens for incoming UDP datagrams, IPv6 address need to be specified as: \"[IPv6]:PORT\"")
.takes_value(true), .takes_value(true),
) )
.arg( .arg(
@ -83,7 +92,7 @@ async fn main() {
) )
.get_matches(); .get_matches();
let local_addr: SocketAddrV4 = matches let local_addr: SocketAddr = matches
.value_of("local") .value_of("local")
.unwrap() .unwrap()
.parse() .parse()
@ -117,7 +126,7 @@ async fn main() {
info!("Created TUN device {}", tun[0].name()); info!("Created TUN device {}", tun[0].name());
let udp_sock = Arc::new(new_udp_reuseport(local_addr)); let udp_sock = Arc::new(new_udp_reuseport(local_addr));
let connections = Arc::new(RwLock::new(HashMap::<SocketAddrV4, Arc<Socket>>::new())); let connections = Arc::new(RwLock::new(HashMap::<SocketAddr, Arc<Socket>>::new()));
let mut stack = Stack::new(tun); let mut stack = Stack::new(tun);
@ -126,7 +135,7 @@ async fn main() {
loop { loop {
tokio::select! { tokio::select! {
Ok((size, SocketAddr::V4(addr))) = udp_sock.recv_from(&mut buf_r) => { Ok((size, addr)) = udp_sock.recv_from(&mut buf_r) => {
// seen UDP packet to listening socket, this means: // seen UDP packet to listening socket, this means:
// 1. It is a new UDP connection, or // 1. It is a new UDP connection, or
// 2. It is some extra packets not filtered by more specific // 2. It is some extra packets not filtered by more specific

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

@ -4,7 +4,7 @@ use clap::{crate_version, App, Arg};
use fake_tcp::packet::MAX_PACKET_LEN; use fake_tcp::packet::MAX_PACKET_LEN;
use fake_tcp::Stack; use fake_tcp::Stack;
use log::{error, info}; use log::{error, info};
use std::net::{Ipv4Addr, SocketAddrV4}; use std::net::{Ipv4Addr, SocketAddr};
use tokio::net::UdpSocket; use tokio::net::UdpSocket;
use tokio::time::{self, Duration}; use tokio::time::{self, Duration};
use tokio_tun::TunBuilder; use tokio_tun::TunBuilder;
@ -32,7 +32,7 @@ async fn main() {
.long("remote") .long("remote")
.required(true) .required(true)
.value_name("IP:PORT") .value_name("IP:PORT")
.help("Sets the address and port where Phantun Server forwards UDP packets to") .help("Sets the address and port where Phantun Server forwards UDP packets to, IPv6 address need to be specified as: \"[IPv6]:PORT\"")
.takes_value(true), .takes_value(true),
) )
.arg( .arg(
@ -71,7 +71,7 @@ async fn main() {
.unwrap() .unwrap()
.parse() .parse()
.expect("bad local port"); .expect("bad local port");
let remote_addr: SocketAddrV4 = matches let remote_addr: SocketAddr = matches
.value_of("remote") .value_of("remote")
.unwrap() .unwrap()
.parse() .parse()
@ -113,7 +113,13 @@ async fn main() {
info!("New connection: {}", sock); info!("New connection: {}", sock);
tokio::spawn(async move { tokio::spawn(async move {
let udp_sock = UdpSocket::bind("0.0.0.0:0").await.unwrap(); let udp_sock = UdpSocket::bind(if remote_addr.is_ipv4() {
"0.0.0.0:0"
} else {
"[::]:0"
})
.await
.unwrap();
udp_sock.connect(remote_addr).await.unwrap(); udp_sock.connect(remote_addr).await.unwrap();
loop { loop {