From 181497e709b8ec49e90b82d316ef82ec55268fc1 Mon Sep 17 00:00:00 2001 From: ssrlive <30760636+ssrlive@users.noreply.github.com> Date: Sat, 6 Apr 2024 16:22:26 +0800 Subject: [PATCH] remove useless get_server_addr --- src/http.rs | 4 ---- src/lib.rs | 2 +- src/no_proxy.rs | 12 +++--------- src/proxy_handler.rs | 1 - src/socks.rs | 4 ---- 5 files changed, 4 insertions(+), 19 deletions(-) diff --git a/src/http.rs b/src/http.rs index 7aa2569..79c403a 100644 --- a/src/http.rs +++ b/src/http.rs @@ -423,10 +423,6 @@ impl ProxyHandlerManager for HttpManager { HttpConnection::new(self.server, info, domain_name, self.credentials.clone(), self.digest_state.clone()).await?, ))) } - - fn get_server_addr(&self) -> SocketAddr { - self.server - } } impl HttpManager { diff --git a/src/lib.rs b/src/lib.rs index 183f37d..b3bf11c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -214,7 +214,7 @@ where ProxyType::Socks5 => Arc::new(SocksProxyManager::new(server_addr, V5, key)) as Arc, ProxyType::Socks4 => Arc::new(SocksProxyManager::new(server_addr, V4, key)) as Arc, ProxyType::Http => Arc::new(HttpManager::new(server_addr, key)) as Arc, - ProxyType::None => Arc::new(NoProxyManager::new(server_addr)) as Arc, + ProxyType::None => Arc::new(NoProxyManager::new()) as Arc, }; let mut ipstack_config = ipstack::IpStackConfig::default(); diff --git a/src/no_proxy.rs b/src/no_proxy.rs index 83edadf..d3c00e0 100644 --- a/src/no_proxy.rs +++ b/src/no_proxy.rs @@ -80,9 +80,7 @@ impl ProxyHandler for NoProxyHandler { } } -pub(crate) struct NoProxyManager { - server: SocketAddr, -} +pub(crate) struct NoProxyManager; #[async_trait::async_trait] impl ProxyHandlerManager for NoProxyManager { @@ -100,14 +98,10 @@ impl ProxyHandlerManager for NoProxyManager { udp_associate, }))) } - - fn get_server_addr(&self) -> SocketAddr { - self.server - } } impl NoProxyManager { - pub(crate) fn new(server: SocketAddr) -> Self { - Self { server } + pub(crate) fn new() -> Self { + Self } } diff --git a/src/proxy_handler.rs b/src/proxy_handler.rs index 94406a6..fb9d9f4 100644 --- a/src/proxy_handler.rs +++ b/src/proxy_handler.rs @@ -27,5 +27,4 @@ pub(crate) trait ProxyHandlerManager: Send + Sync { domain_name: Option, udp_associate: bool, ) -> std::io::Result>>; - fn get_server_addr(&self) -> SocketAddr; } diff --git a/src/socks.rs b/src/socks.rs index a7c0b0b..3800c6a 100644 --- a/src/socks.rs +++ b/src/socks.rs @@ -354,10 +354,6 @@ impl ProxyHandlerManager for SocksProxyManager { command, )?))) } - - fn get_server_addr(&self) -> SocketAddr { - self.server - } } impl SocksProxyManager {