From 37080af275d549979b63d14c6318446ef24be53b Mon Sep 17 00:00:00 2001 From: lubeilin <1791778603@qq.com> Date: Sun, 24 Dec 2023 12:00:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81ipv6=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vnt/src/channel/channel.rs | 75 ++++------------------------------ vnt/src/channel/mod.rs | 1 - vnt/src/core/mod.rs | 28 ++++--------- vnt/src/handle/recv_handler.rs | 3 +- 4 files changed, 16 insertions(+), 91 deletions(-) diff --git a/vnt/src/channel/channel.rs b/vnt/src/channel/channel.rs index da032eb..967dc33 100644 --- a/vnt/src/channel/channel.rs +++ b/vnt/src/channel/channel.rs @@ -1,27 +1,26 @@ +use std::{io, thread}; use std::collections::HashMap; use std::io::{Read, Write}; +use std::net::{Ipv4Addr, Shutdown, SocketAddr}; use std::net::TcpStream; use std::net::UdpSocket as StdUdpSocket; -use std::net::{Ipv4Addr, Ipv6Addr, Shutdown, SocketAddr}; use std::sync::Arc; use std::time::{Duration, Instant}; -use std::{io, thread}; use crossbeam_utils::atomic::AtomicCell; use parking_lot::RwLock; use tokio::net::UdpSocket; use tokio::sync::watch::{channel, Receiver, Sender}; +use crate::channel::{Route, RouteKey, Status, TCP_ID, UDP_ID}; use crate::channel::punch::NatType; -use crate::channel::{Route, RouteKey, Status, TCP_ID, UDP_ID, UDP_V6_ID}; use crate::core::status::VntWorker; -use crate::handle::recv_handler::ChannelDataHandler; use crate::handle::CurrentDeviceInfo; +use crate::handle::recv_handler::ChannelDataHandler; pub struct ContextInner { //udp用于打洞、服务端通信(可选) pub(crate) main_channel: Arc, - pub(crate) main_channel_ipv6: Option>, //在udp的基础上，可以选择使用tcp和服务端通信 pub(crate) main_tcp_channel: Option>>, pub(crate) route_table: RwLock)>>>, @@ -41,7 +40,6 @@ pub struct Context { impl Context { pub fn new( main_channel: Arc, - main_channel_ipv6: Option>, main_tcp_channel: Option>>, current_device: Arc>, _channel_num: usize, @@ -52,7 +50,6 @@ impl Context { let (status_sender, status_receiver) = channel(Status::Cone); let inner = Arc::new(ContextInner { main_channel, - main_channel_ipv6, main_tcp_channel, route_table: RwLock::new(HashMap::with_capacity(16)), status_receiver, @@ -75,18 +72,12 @@ impl Context { } pub fn close(&self) -> io::Result<()> { let _ = self.inner.status_sender.send(Status::Close); - if let Ok(port) = self.main_local_ipv4_port() { + if let Ok(port) = self.main_local_udp_port() { let _ = StdUdpSocket::bind("127.0.0.1:0")?.send_to( b"stop", SocketAddr::V4(std::net::SocketAddrV4::new(Ipv4Addr::LOCALHOST, port)), ); } - if let Ok(port) = self.main_local_ipv6_port() { - let _ = StdUdpSocket::bind("[::]:0")?.send_to( - b"stop", - SocketAddr::V6(std::net::SocketAddrV6::new(Ipv6Addr::LOCALHOST, port, 0, 0)), - ); - } if let Some(tcp) = &self.inner.main_tcp_channel { let _ = tcp.send(vec![]); } @@ -111,32 +102,18 @@ impl Context { pub fn switch_to_symmetric(&self) { let _ = self.inner.status_sender.send(Status::Symmetric); } - pub fn main_local_ipv4_port(&self) -> io::Result { + pub fn main_local_udp_port(&self) -> io::Result { self.inner.main_channel.local_addr().map(|k| k.port()) } - pub fn main_local_ipv6_port(&self) -> io::Result { - if let Some(ipv6) = &self.inner.main_channel_ipv6 { - ipv6.local_addr().map(|k| k.port()) - } else { - Err(io::Error::new(io::ErrorKind::Other, "not ipv6")) - } - } fn insert_udp(&self, id: usize, udp: Arc) { self.inner.udp_map.write().insert(id, udp); } fn remove_udp(&self, id: usize) { self.inner.udp_map.write().remove(&id); } + #[inline] pub fn send_main_udp(&self, buf: &[u8], addr: SocketAddr) -> io::Result { - if addr.is_ipv6() { - if let Some(udp_ipv6) = &self.inner.main_channel_ipv6 { - udp_ipv6.send_to(buf, addr) - } else { - Err(io::Error::new(io::ErrorKind::Other, "not ipv6")) - } - } else { - self.inner.main_channel.send_to(buf, addr) - } + self.inner.main_channel.send_to(buf, addr) } pub fn send_main(&self, buf: &[u8], addr: SocketAddr) -> io::Result { @@ -209,13 +186,6 @@ impl Context { } } UDP_ID => self.inner.main_channel.send_to(buf, route_key.addr), - UDP_V6_ID => { - if let Some(udp_ipv6) = &self.inner.main_channel_ipv6 { - udp_ipv6.send_to(buf, route_key.addr) - } else { - Err(io::Error::new(io::ErrorKind::Other, "not ipv6 udp")) - } - } _ => { if let Some(udp) = self.get_udp_by_route(route_key) { return udp.send_to(buf, route_key.addr).await; @@ -238,13 +208,6 @@ impl Context { } } UDP_ID => self.inner.main_channel.send_to(buf, route_key.addr), - UDP_V6_ID => { - if let Some(udp_ipv6) = &self.inner.main_channel_ipv6 { - udp_ipv6.send_to(buf, route_key.addr) - } else { - Err(io::Error::new(io::ErrorKind::Other, "not ipv6 udp")) - } - } _ => { if let Some(udp) = self.get_udp_by_route(route_key) { return udp.try_send_to(buf, route_key.addr); @@ -584,28 +547,6 @@ impl Channel { }) .unwrap(); } - if let Some(main_channel_ipv6) = &context.inner.main_channel_ipv6 { - let worker = worker.worker("main_channel_ipv6"); - let context = context.clone(); - let main_channel_ipv6 = main_channel_ipv6.clone(); - let handler = handler.clone(); - let buf_sender = buf_sender.clone(); - thread::Builder::new() - .name("ipv6-recv".into()) - .spawn(move || { - log::info!("启动udp v6"); - Self::main_start_( - worker, - context, - UDP_V6_ID, - main_channel_ipv6, - handler, - buf_sender, - head_reserve, - ) - }) - .unwrap(); - } { let worker = worker.worker("main_channel_1"); let context = context.clone(); diff --git a/vnt/src/channel/mod.rs b/vnt/src/channel/mod.rs index c985708..0909a47 100644 --- a/vnt/src/channel/mod.rs +++ b/vnt/src/channel/mod.rs @@ -7,7 +7,6 @@ pub mod sender; const TCP_ID: usize = 0; const UDP_ID: usize = 1; -const UDP_V6_ID: usize = 2; #[derive(Copy, Clone, Eq, PartialEq)] pub enum Status { diff --git a/vnt/src/core/mod.rs b/vnt/src/core/mod.rs index 8ca924c..3f9aae5 100644 --- a/vnt/src/core/mod.rs +++ b/vnt/src/core/mod.rs @@ -57,7 +57,6 @@ pub struct Vnt { pub struct VntUtil { config: Config, main_channel: UdpSocket, - main_channel_ipv6: Option, main_tcp_channel: Option, response: Option, iface: Option<(DeviceWriter, DeviceReader)>, @@ -67,24 +66,14 @@ pub struct VntUtil { impl VntUtil { pub fn new(config: Config) -> io::Result { + let address: SocketAddr = format!("[::]:{}", config.port).parse().unwrap(); //单个udp用同步的性能更好，但是代理和多端口监听用异步更方便，这里将两者结合起来 - let main_channel = UdpSocket::bind(format!("0.0.0.0:{}", config.port))?; + let socket = socket2::Socket::new(socket2::Domain::IPV6,socket2::Type::DGRAM,None)?; + socket.set_only_v6(false)?; + socket.bind(&address.into())?; + let main_channel:UdpSocket = socket.into(); main_channel.set_write_timeout(Some(Duration::from_secs(5)))?; main_channel.set_read_timeout(Some(Duration::from_secs(2)))?; - let main_channel_ipv6 = if config.punch_model != PunchModel::IPv4 { - match UdpSocket::bind(format!("[::]:{}", config.port)) { - Ok(main_channel_ipv6) => { - main_channel_ipv6.set_write_timeout(Some(Duration::from_secs(5)))?; - Some(main_channel_ipv6) - } - Err(e) => { - log::warn!("绑定ipv6地址失败:{}", e); - None - } - } - } else { - None - }; let server_cipher = if config.server_encrypt { let mut key = [0u8; 32]; rand::thread_rng().fill(&mut key); @@ -95,7 +84,6 @@ impl VntUtil { Ok(VntUtil { config, main_channel, - main_channel_ipv6, main_tcp_channel: None, response: None, iface: None, @@ -256,7 +244,6 @@ impl VntUtil { }; let context = Context::new( Arc::new(self.main_channel), - self.main_channel_ipv6.map(|v| Arc::new(v)), tcp_sender, current_device.clone(), 1, @@ -282,11 +269,10 @@ impl VntUtil { let connect_status = Arc::new(AtomicCell::new(ConnectStatus::Connected)); let public_ip = response.public_ip; let public_port = response.public_port; - let local_port = context.main_local_ipv4_port().unwrap_or(0); + let local_port = context.main_local_udp_port().unwrap_or(0); let local_ipv4_addr = crate::nat::local_ipv4_addr(local_port); - let ipv6_port = context.main_local_ipv6_port().unwrap_or(0); - let ipv6_addr = crate::nat::local_ipv6_addr(ipv6_port); + let ipv6_addr = crate::nat::local_ipv6_addr(local_port); // NAT检测 let nat_test = NatTest::new( config.stun_server.clone(), diff --git a/vnt/src/handle/recv_handler.rs b/vnt/src/handle/recv_handler.rs index 3717b7a..397fb96 100644 --- a/vnt/src/handle/recv_handler.rs +++ b/vnt/src/handle/recv_handler.rs @@ -592,9 +592,8 @@ impl ChannelDataHandler { .build() .unwrap() .block_on(async move { - let local_port = context.main_local_ipv4_port().unwrap_or(0); + let local_port = context.main_local_udp_port().unwrap_or(0); let local_ipv4_addr = nat::local_ipv4_addr(local_port); - let local_port = context.main_local_ipv6_port().unwrap_or(0); let ipv6_addr = nat::local_ipv6_addr(local_port); let nat_info = nat_test .re_test(