Rename tcp_socket_config to socket_transformer since it accept a TcpSocket and return a Result<TcpSocket>

eval-exec · eval-exec · commit d41cd7a0e788 · 2024-12-19T09:52:09.000+08:00
Signed-off-by: Eval EXEC &lt;execvy@gmail.com&gt;
diff --git a/tentacle/src/builder.rs b/tentacle/src/builder.rs
@@ -220,7 +220,7 @@ where
     where
         F: Fn(TcpSocket) -> Result<TcpSocket, std::io::Error> + Send + Sync + 'static,
     {
-        self.config.tcp_config.tcp.tcp_socket_config = Arc::new(f);
+        self.config.tcp_config.tcp.socket_transformer = Arc::new(f);
         self
     }
 
@@ -238,7 +238,7 @@ where
     where
         F: Fn(TcpSocket) -> Result<TcpSocket, std::io::Error> + Send + Sync + 'static,
     {
-        self.config.tcp_config.ws.tcp_socket_config = Arc::new(f);
+        self.config.tcp_config.ws.socket_transformer = Arc::new(f);
         self
     }
 
@@ -262,7 +262,7 @@ where
     where
         F: Fn(TcpSocket) -> Result<TcpSocket, std::io::Error> + Send + Sync + 'static,
     {
-        self.config.tcp_config.tls.tcp_socket_config = Arc::new(f);
+        self.config.tcp_config.tls.socket_transformer = Arc::new(f);
         self
     }
 }
diff --git a/tentacle/src/runtime/async_runtime/os/mod.rs b/tentacle/src/runtime/async_runtime/os/mod.rs
@@ -138,7 +138,7 @@ pub(crate) fn listen(addr: SocketAddr, tcp_config: TcpSocketConfig) -> io::Resul
     let socket = Socket::new(domain, Type::STREAM, Some(SocketProtocol::TCP))?;
 
     let socket = {
-        let t = (tcp_config.tcp_socket_config)(TcpSocket { inner: socket })?;
+        let t = (tcp_config.socket_transformer)(TcpSocket { inner: socket })?;
         t.inner
     };
     // `bind` twice will return error
@@ -160,7 +160,7 @@ pub(crate) fn listen(addr: SocketAddr, tcp_config: TcpSocketConfig) -> io::Resul
 
 async fn connect_direct(
     addr: SocketAddr,
-    tcp_socket_transformer: TcpSocketTransformer,
+    socket_transformer: TcpSocketTransformer,
 ) -> io::Result<TcpStream> {
     let domain = Domain::for_address(addr);
     let socket = Socket::new(domain, Type::STREAM, Some(SocketProtocol::TCP))?;
@@ -177,7 +177,7 @@ async fn connect_direct(
         // user can disable it on tcp_config
         #[cfg(not(windows))]
         socket.set_reuse_address(true)?;
-        let t = tcp_socket_transformer(TcpSocket { inner: socket })?;
+        let t = socket_transformer(TcpSocket { inner: socket })?;
         t.inner
     };
 
@@ -214,7 +214,7 @@ async fn connect_direct(
 
 async fn connect_by_proxy<A>(
     target_addr: A,
-    tcp_socket_transformer: TcpSocketTransformer,
+    socket_transformer: TcpSocketTransformer,
     proxy_config: ProxyConfig,
 ) -> io::Result<TcpStream>
 where
@@ -223,7 +223,7 @@ where
     let socks5_config = socks5_config::parse(&proxy_config.proxy_url)?;
 
     let dial_addr: SocketAddr = socks5_config.proxy_url.parse().map_err(io::Error::other)?;
-    let stream = connect_direct(dial_addr, tcp_socket_transformer).await?;
+    let stream = connect_direct(dial_addr, socket_transformer).await?;
 
     crate::runtime::proxy::socks5::establish_connection(stream, target_addr, socks5_config)
         .await
@@ -235,12 +235,12 @@ pub(crate) async fn connect(
     tcp_config: TcpSocketConfig,
 ) -> io::Result<TcpStream> {
     let TcpSocketConfig {
-        tcp_socket_config,
+        socket_transformer,
         proxy_config,
     } = tcp_config;
     match proxy_config {
-        Some(proxy_config) => connect_by_proxy(addr, tcp_socket_config, proxy_config).await,
-        None => connect_direct(addr, tcp_socket_config).await,
+        Some(proxy_config) => connect_by_proxy(addr, socket_transformer, proxy_config).await,
+        None => connect_direct(addr, socket_transformer).await,
     }
 }
 
@@ -249,7 +249,7 @@ pub(crate) async fn connect_onion(
     tcp_config: TcpSocketConfig,
 ) -> io::Result<TcpStream> {
     let TcpSocketConfig {
-        tcp_socket_config,
+        socket_transformer,
         proxy_config,
     } = tcp_config;
     let proxy_config = proxy_config.ok_or(io::Error::other(
@@ -258,5 +258,5 @@ pub(crate) async fn connect_onion(
     let onion_address = shadowsocks::relay::Address::from_str(onion_addr.to_string().as_str())
         .map_err(std::io::Error::other)?;
 
-    connect_by_proxy(onion_address, tcp_socket_config, proxy_config).await
+    connect_by_proxy(onion_address, socket_transformer, proxy_config).await
 }
diff --git a/tentacle/src/runtime/tokio_runtime/mod.rs b/tentacle/src/runtime/tokio_runtime/mod.rs
@@ -93,7 +93,7 @@ pub(crate) fn listen(addr: SocketAddr, tcp_config: TcpSocketConfig) -> io::Resul
         // user can disable it on tcp_config
         #[cfg(not(windows))]
         socket.set_reuse_address(true)?;
-        let t = (tcp_config.tcp_socket_config)(TcpSocket { inner: socket })?;
+        let t = (tcp_config.socket_transformer)(TcpSocket { inner: socket })?;
         t.inner.set_nonblocking(true)?;
         // safety: fd convert by socket2
         unsafe {
@@ -120,13 +120,13 @@ pub(crate) fn listen(addr: SocketAddr, tcp_config: TcpSocketConfig) -> io::Resul
 
 async fn connect_direct(
     addr: SocketAddr,
-    tcp_socket_transformer: TcpSocketTransformer,
+    socket_transformer: TcpSocketTransformer,
 ) -> io::Result<TcpStream> {
     let domain = Domain::for_address(addr);
     let socket = Socket::new(domain, Type::STREAM, Some(SocketProtocol::TCP))?;
 
     let socket = {
-        let t = tcp_socket_transformer(TcpSocket { inner: socket })?;
+        let t = socket_transformer(TcpSocket { inner: socket })?;
         t.inner.set_nonblocking(true)?;
         // safety: fd convert by socket2
         unsafe {
@@ -143,7 +143,7 @@ async fn connect_direct(
 
 async fn connect_by_proxy<A>(
     target_addr: A,
-    tcp_socket_transformer: TcpSocketTransformer,
+    socket_transformer: TcpSocketTransformer,
     proxy_config: ProxyConfig,
 ) -> io::Result<TcpStream>
 where
@@ -152,7 +152,7 @@ where
     let socks5_config = socks5_config::parse(&proxy_config.proxy_url)?;
 
     let dial_addr: SocketAddr = socks5_config.proxy_url.parse().map_err(io::Error::other)?;
-    let stream = connect_direct(dial_addr, tcp_socket_transformer).await?;
+    let stream = connect_direct(dial_addr, socket_transformer).await?;
 
     super::proxy::socks5::establish_connection(stream, target_addr, socks5_config)
         .await
@@ -164,13 +164,13 @@ pub(crate) async fn connect(
     tcp_config: TcpSocketConfig,
 ) -> io::Result<TcpStream> {
     let TcpSocketConfig {
-        tcp_socket_config,
+        socket_transformer,
         proxy_config,
     } = tcp_config;
 
     match proxy_config {
-        Some(proxy_config) => connect_by_proxy(target_addr, tcp_socket_config, proxy_config).await,
-        None => connect_direct(target_addr, tcp_socket_config).await,
+        Some(proxy_config) => connect_by_proxy(target_addr, socket_transformer, proxy_config).await,
+        None => connect_direct(target_addr, socket_transformer).await,
     }
 }
 
@@ -179,7 +179,7 @@ pub(crate) async fn connect_onion(
     tcp_config: TcpSocketConfig,
 ) -> io::Result<TcpStream> {
     let TcpSocketConfig {
-        tcp_socket_config,
+        socket_transformer,
         proxy_config,
     } = tcp_config;
     let proxy_config = proxy_config.ok_or(io::Error::other(
@@ -188,5 +188,5 @@ pub(crate) async fn connect_onion(
     let onion_address = shadowsocks::relay::Address::from_str(onion_addr.to_string().as_str())
         .map_err(std::io::Error::other)?;
 
-    connect_by_proxy(onion_address, tcp_socket_config, proxy_config).await
+    connect_by_proxy(onion_address, socket_transformer, proxy_config).await
 }
diff --git a/tentacle/src/service/config.rs b/tentacle/src/service/config.rs
@@ -95,17 +95,17 @@ pub struct ProxyConfig {
 
 pub(crate) type TcpSocketTransformer =
     Arc<dyn Fn(TcpSocket) -> Result<TcpSocket, std::io::Error> + Send + Sync + 'static>;
-#[derive(Clone)]
 
+#[derive(Clone)]
 pub(crate) struct TcpSocketConfig {
-    pub(crate) tcp_socket_config: TcpSocketTransformer,
+    pub(crate) socket_transformer: TcpSocketTransformer,
     pub(crate) proxy_config: Option<ProxyConfig>,
 }
 
 impl Default for TcpSocketConfig {
     fn default() -> Self {
         Self {
-            tcp_socket_config: Arc::new(Ok),
+            socket_transformer: Arc::new(Ok),
             proxy_config: None,
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ where`
`220`	`220`	`where`
`221`	`221`	`F: Fn(TcpSocket) -> Result<TcpSocket, std::io::Error> + Send + Sync + 'static,`
`222`	`222`	`{`
`223`		`- self.config.tcp_config.tcp.tcp_socket_config = Arc::new(f);`
	`223`	`+ self.config.tcp_config.tcp.socket_transformer = Arc::new(f);`
`224`	`224`	`self`
`225`	`225`	`}`
`226`	`226`
`@@ -238,7 +238,7 @@ where`
`238`	`238`	`where`
`239`	`239`	`F: Fn(TcpSocket) -> Result<TcpSocket, std::io::Error> + Send + Sync + 'static,`
`240`	`240`	`{`
`241`		`- self.config.tcp_config.ws.tcp_socket_config = Arc::new(f);`
	`241`	`+ self.config.tcp_config.ws.socket_transformer = Arc::new(f);`
`242`	`242`	`self`
`243`	`243`	`}`
`244`	`244`
`@@ -262,7 +262,7 @@ where`
`262`	`262`	`where`
`263`	`263`	`F: Fn(TcpSocket) -> Result<TcpSocket, std::io::Error> + Send + Sync + 'static,`
`264`	`264`	`{`
`265`		`- self.config.tcp_config.tls.tcp_socket_config = Arc::new(f);`
	`265`	`+ self.config.tcp_config.tls.socket_transformer = Arc::new(f);`
`266`	`266`	`self`
`267`	`267`	`}`
`268`	`268`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,17 +95,17 @@ pub struct ProxyConfig {`
`95`	`95`
`96`	`96`	`pub(crate) type TcpSocketTransformer =`
`97`	`97`	`Arc<dyn Fn(TcpSocket) -> Result<TcpSocket, std::io::Error> + Send + Sync + 'static>;`
`98`		`-#[derive(Clone)]`
`99`	`98`
	`99`	`+#[derive(Clone)]`
`100`	`100`	`pub(crate) struct TcpSocketConfig {`
`101`		`- pub(crate) tcp_socket_config: TcpSocketTransformer,`
	`101`	`+ pub(crate) socket_transformer: TcpSocketTransformer,`
`102`	`102`	`pub(crate) proxy_config: Option<ProxyConfig>,`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`impl Default for TcpSocketConfig {`
`106`	`106`	`fn default() -> Self {`
`107`	`107`	`Self {`
`108`		`- tcp_socket_config: Arc::new(Ok),`
	`108`	`+ socket_transformer: Arc::new(Ok),`
`109`	`109`	`proxy_config: None,`
`110`	`110`	`}`
`111`	`111`	`}`