From 03aa70f3c2f82a2c0c57c857d252f473c9051981 Mon Sep 17 00:00:00 2001 From: ssrlive <30760636+ssrlive@users.noreply.github.com> Date: Wed, 27 Sep 2023 23:24:22 +0800 Subject: [PATCH] minor changes --- src/tun2proxy.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tun2proxy.rs b/src/tun2proxy.rs index 5aeccbb..1ecdab7 100644 --- a/src/tun2proxy.rs +++ b/src/tun2proxy.rs @@ -567,7 +567,7 @@ impl<'a> TunToProxy<'a> { assert!(state.dns_over_tcp_expiry.is_some()); state.dns_over_tcp_expiry = Some(Self::common_udp_life_timeout()); - let vecbuf = Self::read_data_from_tcp_stream(&mut state.mio_stream, info)?; + let vecbuf = Self::read_data_from_tcp_stream(&mut state.mio_stream)?; let data_event = IncomingDataEvent { direction: IncomingDirection::FromServer, @@ -1029,7 +1029,7 @@ impl<'a> TunToProxy<'a> { let state = self.connection_map.get_mut(&conn_info).ok_or(e)?; // TODO: Move this reading process to its own function. - let vecbuf = Self::read_data_from_tcp_stream(&mut state.mio_stream, &conn_info)?; + let vecbuf = Self::read_data_from_tcp_stream(&mut state.mio_stream)?; let data_event = IncomingDataEvent { direction: IncomingDirection::FromServer, @@ -1095,13 +1095,13 @@ impl<'a> TunToProxy<'a> { Ok(()) } - fn read_data_from_tcp_stream(stream: &mut TcpStream, conn_info: &ConnectionInfo) -> Result> { + fn read_data_from_tcp_stream(stream: &mut TcpStream) -> Result> { let mut vecbuf = Vec::::new(); loop { let mut tmp: [u8; 4096] = [0_u8; 4096]; match stream.read(&mut tmp) { Ok(0) => { - log::info!("{} closed", conn_info); + // The tcp connection closed break; } Ok(read_result) => {