From fb86172ecc9795aa2fcdaa449836c7ef97f6348d Mon Sep 17 00:00:00 2001 From: ssrlive <30760636+ssrlive@users.noreply.github.com> Date: Tue, 22 Aug 2023 12:59:31 +0800 Subject: [PATCH] refine code --- src/tun2proxy.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/tun2proxy.rs b/src/tun2proxy.rs index 848267e..27e8635 100644 --- a/src/tun2proxy.rs +++ b/src/tun2proxy.rs @@ -480,7 +480,7 @@ impl<'a> TunToProxy<'a> { Ok(connection_info) } - fn deal_with_incoming_udp_packets( + fn process_incoming_udp_packets( &mut self, manager: &Rc, info: &ConnectionInfo, @@ -538,13 +538,12 @@ impl<'a> TunToProxy<'a> { let connection_info = self.preprocess_origin_connection_info(info)?; let manager = self.get_connection_manager().ok_or("get connection manager")?; - let server_addr = manager.get_server_addr(); if connection_info.protocol == IpProtocol::Tcp { if _first_packet { let tcp_proxy_handler = manager.new_tcp_proxy(&connection_info, false)?; - #[rustfmt::skip] - let state = self.create_new_tcp_connection_state(server_addr, origin_dst, tcp_proxy_handler, false)?; + let server = manager.get_server_addr(); + let state = self.create_new_tcp_connection_state(server, origin_dst, tcp_proxy_handler, false)?; self.connection_map.insert(connection_info.clone(), state); log::info!("Connect done {} ({})", connection_info, origin_dst); @@ -578,7 +577,7 @@ impl<'a> TunToProxy<'a> { self.send_udp_packet_to_client(origin_dst, connection_info.src, response.as_slice())?; } else { // Another UDP packet - self.deal_with_incoming_udp_packets(&manager, &connection_info, origin_dst, payload)?; + self.process_incoming_udp_packets(&manager, &connection_info, origin_dst, payload)?; } } else { log::warn!("Unsupported protocol: {} ({})", connection_info, origin_dst);