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

Fix handling of multiple packets per event

Browse source
This commit is contained in:
B. Blechschmidt 2023-08-20 19:36:59 +02:00
parent aa059e0dd5
commit b244286e4d
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/tun2proxy.rs
View file

@ -541,8 +541,7 @@ impl<'a> TunToProxy<'a> {
self.tunsocket_read_and_forward(&connection_info)?; self.tunsocket_read_and_forward(&connection_info)?;
self.write_to_server(&connection_info)?; self.write_to_server(&connection_info)?;
} else { } else {
log::info!("Subsequent udp packet {} ({})", connection_info, origin_dst); log::trace!("Subsequent udp packet {} ({})", connection_info, origin_dst);
// log::trace!("Subsequent udp packet {} ({})", connection_info, origin_dst);
} }
let err = "udp associate state not find"; let err = "udp associate state not find";
@ -561,8 +560,8 @@ impl<'a> TunToProxy<'a> {
socket.send_to(&s5_udp_data, udp_associate)?; socket.send_to(&s5_udp_data, udp_associate)?;
} }
} else { } else {
log::info!("Cache udp packet {} ({})", connection_info, origin_dst);
// UDP associate tunnel not ready yet, we must cache the packet... // UDP associate tunnel not ready yet, we must cache the packet...
log::trace!("Cache udp packet {} ({})", connection_info, origin_dst);
state.udp_data_cache.push_back(s5_udp_data); state.udp_data_cache.push_back(s5_udp_data);
} }
} }
@ -766,11 +765,12 @@ impl<'a> TunToProxy<'a> {
let err = "udp connection state not found"; let err = "udp connection state not found";
let state = self.connection_map.get_mut(&info).ok_or(err)?; let state = self.connection_map.get_mut(&info).ok_or(err)?;
state.expiry = Some(Self::udp_associate_timeout()); state.expiry = Some(Self::udp_associate_timeout());
let src = state.udp_origin_dst.ok_or("udp address")?;
let mut to_send: LinkedList<Vec<u8>> = LinkedList::new();
if let Some(udp_socket) = state.udp_socket.as_ref() { if let Some(udp_socket) = state.udp_socket.as_ref() {
let mut buf = [0; 1 << 16]; let mut buf = [0; 1 << 16];
// Receive UDP packet from remote SOCKS5 server // Receive UDP packet from remote SOCKS5 server
let (packet_size, _svr_addr) = udp_socket.recv_from(&mut buf)?; while let Ok((packet_size, _svr_addr)) = udp_socket.recv_from(&mut buf) {
let buf = buf[..packet_size].to_vec(); let buf = buf[..packet_size].to_vec();
let header = UdpHeader::retrieve_from_stream(&mut &buf[..])?; let header = UdpHeader::retrieve_from_stream(&mut &buf[..])?;
@ -782,9 +782,14 @@ impl<'a> TunToProxy<'a> {
buf[header.len()..].to_vec() buf[header.len()..].to_vec()
}; };
// Escape the borrow checker madness
to_send.push_back(buf);
}
}
// Write to client // Write to client
let src = state.udp_origin_dst.ok_or("udp address")?; while let Some(packet) = to_send.pop_front() {
self.send_udp_packet_to_client(src, info.src, &buf)?; self.send_udp_packet_to_client(src, info.src, &packet)?;
} }
return Ok(()); return Ok(());