suhoan/EasyTier
1
0
Fork 0
mirror of https://mirror.suhoan.cn/https://github.com/EasyTier/EasyTier.git synced 2025-12-12 12:47:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix connect failed after setup one of sockets fails

Browse Source
This commit is contained in:
sijie.sun
2024-09-18 22:12:21 +08:00
committed by Sijie.Sun
parent 9f273dc887
commit 6d7edcd486
4 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
easytier/src/tunnel/tcp.rs
View File

@@ -139,7 +139,11 @@ impl TcpTunnelConnector {
socket2::Type::STREAM,
Some(socket2::Protocol::TCP),
)?;
setup_sokcet2(&socket2_socket, bind_addr)?;
if let Err(e) = setup_sokcet2(&socket2_socket, bind_addr) {
tracing::error!(bind_addr = ?bind_addr, ?addr, "bind addr fail: {:?}", e);
continue;
}
let socket = TcpSocket::from_std_stream(socket2_socket.into());
futures.push(socket.connect(addr.clone()));

5
easytier/src/tunnel/udp.rs
View File

@@ -673,7 +673,10 @@ impl UdpTunnelConnector {
socket2::Type::DGRAM,
Some(socket2::Protocol::UDP),
)?;
setup_sokcet2(&socket2_socket, &bind_addr)?;
if let Err(e) = setup_sokcet2(&socket2_socket, bind_addr) {
tracing::error!(bind_addr = ?bind_addr, ?addr, "bind addr fail: {:?}", e);
continue;
}
let socket = UdpSocket::from_std(socket2_socket.into())?;
futures.push(self.try_connect_with_socket(Arc::new(socket), addr));
}

6
easytier/src/tunnel/websocket.rs
View File

@@ -241,7 +241,11 @@ impl WSTunnelConnector {
socket2::Type::STREAM,
Some(socket2::Protocol::TCP),
)?;
setup_sokcet2(&socket2_socket, bind_addr)?;
if let Err(e) = setup_sokcet2(&socket2_socket, bind_addr) {
tracing::error!(bind_addr = ?bind_addr, ?addr, "bind addr fail: {:?}", e);
continue;
}
let socket = TcpSocket::from_std_stream(socket2_socket.into());
futures.push(Self::connect_with(

13
easytier/src/tunnel/wireguard.rs
View File

@@ -722,8 +722,17 @@ impl super::TunnelConnector for WgTunnelConnector {
socket2::Type::DGRAM,
Some(socket2::Protocol::UDP),
)?;
setup_sokcet2(&socket2_socket, &bind_addr)?;
let socket = UdpSocket::from_std(socket2_socket.into())?;
if let Err(e) = setup_sokcet2(&socket2_socket, &bind_addr) {
tracing::error!(bind_addr = ?bind_addr, ?addr, "bind addr fail: {:?}", e);
continue;
}
let socket = match UdpSocket::from_std(socket2_socket.into()) {
Ok(s) => s,
Err(e) => {
tracing::error!(bind_addr = ?bind_addr, ?addr, "create udp socket fail: {:?}", e);
continue;
}
};
tracing::info!(?bind_addr, ?self.addr, "prepare wg connect task");
futures.push(Self::connect_with_socket(
self.addr.clone(),