fix: regression for L7-based chain proxy

XOR-op · Feb 10, 2024 · 62d2eba · 62d2eba
1 parent de6b370
commit 62d2eba
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 27 deletions.
diff --git a/boltconn/src/adapter/http.rs b/boltconn/src/adapter/http.rs
@@ -130,10 +130,13 @@ impl Outbound for HttpOutbound {
  tracing::error!("Invalid HTTP proxy tcp spawn");
  return Err(io::ErrorKind::InvalidData.into());
  }
- self.clone()
- .run_tcp(inbound, tcp_outbound.unwrap(), abort_handle)
- .await
- .map_err(|e| io_err(e.to_string().as_str()))?;
+ let self_clone = self.clone();
+ tokio::spawn(async move {
+ self_clone
+ .run_tcp(inbound, tcp_outbound.unwrap(), abort_handle)
+ .await
+ .map_err(|e| io_err(e.to_string().as_str()))
+ });
  Ok(true)
  }
 

diff --git a/boltconn/src/adapter/shadowsocks.rs b/boltconn/src/adapter/shadowsocks.rs
@@ -164,10 +164,13 @@ impl Outbound for SSOutbound {
  tracing::error!("Invalid Shadowsocks tcp spawn");
  return Err(io::ErrorKind::InvalidData.into());
  }
- let server_addr = self.get_server_addr().await?;
- self.clone()
- .run_tcp(inbound, tcp_outbound.unwrap(), server_addr, abort_handle)
- .await?;
+ let self_clone = self.clone();
+ tokio::spawn(async move {
+ let server_addr = self_clone.get_server_addr().await?;
+ self_clone
+ .run_tcp(inbound, tcp_outbound.unwrap(), server_addr, abort_handle)
+ .await
+ });
  Ok(true)
  }
 
@@ -213,16 +216,19 @@ impl Outbound for SSOutbound {
  return Err(io::ErrorKind::InvalidData.into());
  }
  let udp_outbound = udp_outbound.unwrap();
- let server_addr = self.get_server_addr().await?;
- self.clone()
- .run_udp(
- AdapterOrSocket::Adapter(Arc::from(udp_outbound)),
- inbound,
- server_addr,
- abort_handle,
- tunnel_only,
- )
- .await?;
+ let self_clone = self.clone();
+ tokio::spawn(async move {
+ let server_addr = self_clone.get_server_addr().await?;
+ self_clone
+ .run_udp(
+ AdapterOrSocket::Adapter(Arc::from(udp_outbound)),
+ inbound,
+ server_addr,
+ abort_handle,
+ tunnel_only,
+ )
+ .await
+ });
  Ok(true)
  }
 }

diff --git a/boltconn/src/adapter/socks5.rs b/boltconn/src/adapter/socks5.rs
@@ -161,9 +161,12 @@ impl Outbound for Socks5Outbound {
  tracing::error!("Invalid Socks5 tcp spawn");
  return Err(io::ErrorKind::InvalidData.into());
  }
- self.clone()
- .run_tcp(inbound, tcp_outbound.unwrap(), abort_handle)
- .await?;
+ let self_clone = self.clone();
+ tokio::spawn(async move {
+ self_clone
+ .run_tcp(inbound, tcp_outbound.unwrap(), abort_handle)
+ .await
+ });
  Ok(true)
  }
 

diff --git a/boltconn/src/adapter/trojan.rs b/boltconn/src/adapter/trojan.rs
@@ -199,9 +199,12 @@ impl Outbound for TrojanOutbound {
  tracing::error!("Invalid Trojan UDP outbound ancestor");
  return Err(io::ErrorKind::InvalidData.into());
  }
- self.clone()
- .run_tcp(inbound, tcp_outbound.unwrap(), abort_handle)
- .await?;
+ let self_clone = self.clone();
+ tokio::spawn(async move {
+ self_clone
+ .run_tcp(inbound, tcp_outbound.unwrap(), abort_handle)
+ .await
+ });
  Ok(true)
  }
 
@@ -237,9 +240,12 @@ impl Outbound for TrojanOutbound {
  return Err(io::ErrorKind::InvalidData.into());
  }
  let tcp_outbound = tcp_outbound.unwrap();
- self.clone()
- .run_udp(inbound, tcp_outbound, abort_handle, tunnel_only)
- .await?;
+ let self_clone = self.clone();
+ tokio::spawn(async move {
+ self_clone
+ .run_udp(inbound, tcp_outbound, abort_handle, tunnel_only)
+ .await
+ });
  Ok(true)
  }
 }