luckyimnotanigger/tun2proxy
1
0
Fork 0
mirror of https://github.com/tun2proxy/tun2proxy.git synced 2025-04-20 13:59:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix real UDP destination address issue

Browse source
This commit is contained in:
ssrlive 2024-10-23 19:35:19 +08:00
parent ec79d54a9e
commit 1ec7caf844
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/lib.rs
View file

@ -353,7 +353,8 @@ where
let proxy_handler = mgr.new_proxy_handler(tcpinfo, None, false).await?; let proxy_handler = mgr.new_proxy_handler(tcpinfo, None, false).await?;
let queue = socket_queue.clone(); let queue = socket_queue.clone();
tokio::spawn(async move { tokio::spawn(async move {
if let Err(e) = handle_udp_gateway_session(udp, udpgw, domain_name, proxy_handler, queue, ipv6_enabled).await { let dst = info.dst; // real UDP destination address
if let Err(e) = handle_udp_gateway_session(udp, udpgw, dst, domain_name, proxy_handler, queue, ipv6_enabled).await {
log::info!("Ending {} with \"{}\"", info, e); log::info!("Ending {} with \"{}\"", info, e);
} }
log::trace!("Session count {}", TASK_COUNT.fetch_sub(1, Relaxed) - 1); log::trace!("Session count {}", TASK_COUNT.fetch_sub(1, Relaxed) - 1);
@ -482,16 +483,14 @@ async fn handle_tcp_session(
async fn handle_udp_gateway_session( async fn handle_udp_gateway_session(
mut udp_stack: IpStackUdpStream, mut udp_stack: IpStackUdpStream,
udpgw_client: Arc<UdpGwClient>, udpgw_client: Arc<UdpGwClient>,
udp_dst: SocketAddr,
domain_name: Option<String>, domain_name: Option<String>,
proxy_handler: Arc<Mutex<dyn ProxyHandler>>, proxy_handler: Arc<Mutex<dyn ProxyHandler>>,
socket_queue: Option<Arc<SocketQueue>>, socket_queue: Option<Arc<SocketQueue>>,
ipv6_enabled: bool, ipv6_enabled: bool,
) -> crate::Result<()> { ) -> crate::Result<()> {
let (_session_info, server_addr) = { let proxy_server_addr = { proxy_handler.lock().await.get_server_addr() };
let handler = proxy_handler.lock().await; let udpinfo = SessionInfo::new(udp_stack.local_addr(), udp_dst, IpProtocol::Udp);
(handler.get_session_info(), handler.get_server_addr())
};
let udpinfo = SessionInfo::new(udp_stack.local_addr(), udp_stack.peer_addr(), IpProtocol::Udp);
let udp_mtu = udpgw_client.get_udp_mtu(); let udp_mtu = udpgw_client.get_udp_mtu();
let udp_timeout = udpgw_client.get_udp_timeout(); let udp_timeout = udpgw_client.get_udp_timeout();
let mut server_stream = match udpgw_client.get_server_connection().await { let mut server_stream = match udpgw_client.get_server_connection().await {
@ -500,7 +499,7 @@ async fn handle_udp_gateway_session(
if udpgw_client.is_full() { if udpgw_client.is_full() {
return Err("max udpgw connection limit reached".into()); return Err("max udpgw connection limit reached".into());
} }
let mut tcp_server_stream = create_tcp_stream(&socket_queue, server_addr).await?; let mut tcp_server_stream = create_tcp_stream(&socket_queue, proxy_server_addr).await?;
if let Err(e) = handle_proxy_session(&mut tcp_server_stream, proxy_handler).await { if let Err(e) = handle_proxy_session(&mut tcp_server_stream, proxy_handler).await {
return Err(format!("udpgw connection error: {}", e).into()); return Err(format!("udpgw connection error: {}", e).into());
} }
@ -508,8 +507,6 @@ async fn handle_udp_gateway_session(
} }
}; };
let udp_server_addr = udp_stack.peer_addr();
let tcp_local_addr = server_stream.local_addr().clone(); let tcp_local_addr = server_stream.local_addr().clone();
match domain_name { match domain_name {
@ -544,7 +541,7 @@ async fn handle_udp_gateway_session(
} }
} }
let new_id = server_stream.new_id(); let new_id = server_stream.new_id();
if let Err(e) = UdpGwClient::send_udpgw_packet(ipv6_enabled, read_len, udp_server_addr, domain_name.as_ref(), new_id, &mut stream_writer).await { if let Err(e) = UdpGwClient::send_udpgw_packet(ipv6_enabled, read_len, udp_dst, domain_name.as_ref(), new_id, &mut stream_writer).await {
log::info!("Ending {} <- {} with send_udpgw_packet {}", udpinfo, &tcp_local_addr, e); log::info!("Ending {} <- {} with send_udpgw_packet {}", udpinfo, &tcp_local_addr, e);
break; break;
} }