starred/shadowsocks-rust
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-rust.git synced 2026-11-06 16:14:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hide all socks4 implementations behind feature

Browse Source
This commit is contained in:
zonyitoo
2020-05-27 01:07:30 +08:00
parent 5ef6c8821e
commit 1b6b0366fb
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/relay/mod.rs
+1
View File
@@ -10,6 +10,7 @@ pub mod manager;
#[cfg(feature = "local-redir")]
pub(crate) mod redir;
pub mod server;
#[cfg(feature = "local-socks4")]
pub mod socks4;
pub mod socks5;
pub(crate) mod sys;
src/relay/socks4.rs
+1 -1
View File
@@ -115,7 +115,7 @@ impl fmt::Display for ResultCode {
pub enum Address {
/// Socket address (IP Address)
SocketAddress(SocketAddrV4),
/// Domain name address
/// Domain name address (SOCKS4a)
DomainNameAddress(String, u16),
}
src/relay/tcprelay/mod.rs
+1
View File
@@ -27,6 +27,7 @@ mod redir;
#[cfg(feature = "local-redir")]
mod redir_local;
pub mod server;
#[cfg(feature = "local-socks4")]
mod socks4_local;
mod socks5_local;
mod stream;
src/relay/tcprelay/socks4_local.rs
+11 -11
View File
@@ -25,13 +25,13 @@ async fn handle_socks4_connect(
server: &SharedPlainServerStatistic,
mut stream: BufReader<TcpStream>,
client_addr: SocketAddr,
addr: &Address,
addr: Address,
) -> io::Result<()> {
let context = server.context();
let svr_cfg = server.server_config();
// NOTE: Shadowsocks server uses SOCKS5 Address
let ss_addr = From::from(addr.clone());
let ss_addr = addr.into();
let mut svr_s = match ProxyStream::connect(server.clone_context(), svr_cfg, &ss_addr).await {
Ok(svr_s) => {
@@ -87,28 +87,28 @@ async fn handle_socks4_connect(
let rhalf = copy(&mut r, &mut svr_w);
let whalf = copy(&mut svr_r, &mut w);
debug!("CONNECT relay established {} <-> {}", client_addr, addr);
debug!("CONNECT relay established {} <-> {}", client_addr, ss_addr);
match future::select(rhalf, whalf).await {
Either::Left((Ok(..), _)) => trace!("CONNECT relay {} -> {} closed", client_addr, addr),
Either::Left((Ok(..), _)) => trace!("CONNECT relay {} -> {} closed", client_addr, ss_addr),
Either::Left((Err(err), _)) => {
if let ErrorKind::TimedOut = err.kind() {
trace!("CONNECT relay {} -> {} closed with error {}", client_addr, addr, err);
trace!("CONNECT relay {} -> {} closed with error {}", client_addr, ss_addr, err);
} else {
error!("CONNECT relay {} -> {} closed with error {}", client_addr, addr, err);
error!("CONNECT relay {} -> {} closed with error {}", client_addr, ss_addr, err);
}
}
Either::Right((Ok(..), _)) => trace!("CONNECT relay {} <- {} closed", client_addr, addr),
Either::Right((Ok(..), _)) => trace!("CONNECT relay {} <- {} closed", client_addr, ss_addr),
Either::Right((Err(err), _)) => {
if let ErrorKind::TimedOut = err.kind() {
trace!("CONNECT relay {} <- {} closed with error {}", client_addr, addr, err);
trace!("CONNECT relay {} <- {} closed with error {}", client_addr, ss_addr, err);
} else {
error!("CONNECT relay {} <- {} closed with error {}", client_addr, addr, err);
error!("CONNECT relay {} <- {} closed with error {}", client_addr, ss_addr, err);
}
}
}
debug!("CONNECT relay {} <-> {} closed", client_addr, addr);
debug!("CONNECT relay {} <-> {} closed", client_addr, ss_addr);
Ok(())
}
@@ -137,7 +137,7 @@ async fn handle_socks4_client(server: &SharedPlainServerStatistic, s: TcpStream)
Command::Connect => {
debug!("CONNECT {}", handshake_req.dst);
handle_socks4_connect(server, s, client_addr, &handshake_req.dst).await
handle_socks4_connect(server, s, client_addr, handshake_req.dst).await
}
Command::Bind => {
warn!("BIND is not supported");