mirror/Easytier
1
0
Fork 0
mirror of https://github.com/EasyTier/EasyTier.git synced 2026-09-04 10:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove NoGroAsyncUdpSocket (#1867)

Browse Source
This commit is contained in:
Luna Yao
2026-04-10 23:22:08 +08:00
committed by GitHub
parent 19c80c7b9c
commit 8311b11713
12 changed files with 401 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easytier/src/tunnel/udp.rs
+5 -5
View File
@@ -24,7 +24,7 @@ use tracing::{Instrument, instrument};
use super::{
FromUrl, IpVersion, Tunnel, TunnelConnCounter, TunnelError, TunnelInfo, TunnelListener,
TunnelUrl,
common::{setup_sokcet2, setup_sokcet2_ext, wait_for_connect_futures},
common::{setup_socket2, setup_socket2_ext, wait_for_connect_futures},
packet_def::{UDP_TUNNEL_HEADER_SIZE, UDPTunnelHeader, V6HolePunchPacket},
ring::{RingSink, RingStream},
};
@@ -545,9 +545,9 @@ impl TunnelListener for UdpTunnelListener {
let tunnel_url: TunnelUrl = self.addr.clone().into();
if let Some(bind_dev) = tunnel_url.bind_dev() {
setup_sokcet2_ext(&socket2_socket, &addr, Some(bind_dev))?;
setup_socket2_ext(&socket2_socket, &addr, Some(bind_dev), true)?;
} else {
setup_sokcet2(&socket2_socket, &addr)?;
setup_socket2(&socket2_socket, &addr, true)?;
}
self.socket = Some(Arc::new(UdpSocket::from_std(socket2_socket.into())?));
@@ -838,7 +838,7 @@ impl UdpTunnelConnector {
socket2::Type::DGRAM,
Some(socket2::Protocol::UDP),
)?;
if let Err(e) = setup_sokcet2(&socket2_socket, bind_addr) {
if let Err(e) = setup_socket2(&socket2_socket, bind_addr, true) {
tracing::error!(bind_addr = ?bind_addr, ?addr, "bind addr fail: {:?}", e);
continue;
}
@@ -1040,7 +1040,7 @@ mod tests {
Some(socket2::Protocol::UDP),
)
.unwrap();
setup_sokcet2_ext(&socket2_socket, &addr, bind_dev.clone()).unwrap();
setup_socket2_ext(&socket2_socket, &addr, bind_dev.clone(), true).unwrap();
}
}