Skip to content

Commit 09c622b

Browse files
zonyitoozonyitoo
committed
Removed logs that no body cares
1 parent 429b7ab commit 09c622b

File tree

5 files changed

+82
-80
lines changed

5 files changed

+82
-80
lines changed

‎Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/relay/dns_resolver.rs‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,24 +54,23 @@ fn inner_resolve(
5454
port: u16,
5555
check_forbidden: bool,
5656
) -> impl Future<Item = Vec<SocketAddr>, Error = io::Error> + Send {
57-
let owned_addr = addr.to_owned();
58-
let owned_addr2 = owned_addr.clone();
57+
// let owned_addr = addr.to_owned();
5958
let cloned_context = context.clone();
60-
61-
context
62-
.dns_resolver()
63-
.lookup_ip(addr)
64-
.map_err(move |err| {
65-
error!("Failed to resolve {}, err: {}", owned_addr2, err);
66-
io::Error::new(io::ErrorKind::Other, "dns resolve error")
67-
})
68-
.and_then(move |lookup_result| {
59+
context.dns_resolver().lookup_ip(addr).then(move |r| match r {
60+
Err(err) => {
61+
// error!("Failed to resolve {}, err: {}", owned_addr, err);
62+
Err(io::Error::new(
63+
io::ErrorKind::Other,
64+
format!("dns resolve error: {}", err),
65+
))
66+
}
67+
Ok(lookup_result) => {
6968
let mut vaddr = Vec::new();
7069
for ip in lookup_result.iter() {
7170
if check_forbidden {
7271
let forbidden_ip = &cloned_context.config().forbidden_ip;
7372
if forbidden_ip.contains(&ip) {
74-
debug!("Resolved {} => {}, which is skipped by forbidden_ip", owned_addr, ip);
73+
// debug!("Resolved {} => {}, which is skipped by forbidden_ip", owned_addr, ip);
7574
continue;
7675
}
7776
}
@@ -81,14 +80,16 @@ fn inner_resolve(
8180
if vaddr.is_empty() {
8281
let err = io::Error::new(
8382
ErrorKind::Other,
84-
format!("resolved {} to empty address, all IPs are filtered", owned_addr),
83+
// format!("resolved {} to empty address, all IPs are filtered", owned_addr),
84+
"resolved to empty address, all IPs are filtered",
8585
);
8686
Err(err)
8787
} else {
88-
debug!("Resolved {} => {:?}", owned_addr, vaddr);
88+
// debug!("Resolved {} => {:?}", owned_addr, vaddr);
8989
Ok(vaddr)
9090
}
91-
})
91+
}
92+
})
9293
}
9394

9495
/// Resolve address to IP

‎src/relay/tcprelay/mod.rs‎

Lines changed: 55 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ mod utils;
4747

4848
const BUFFER_SIZE: usize = 8 * 1024; // 8K buffer
4949

50-
/// Directions in the tunnel
51-
#[derive(Debug, Copy, Clone)]
52-
pub enum TunnelDirection {
53-
/// Client -> Server
54-
Client2Server,
55-
/// Client <- Server
56-
Server2Client,
57-
}
50+
// /// Directions in the tunnel
51+
// #[derive(Debug, Copy, Clone)]
52+
// pub enum TunnelDirection {
53+
// /// Client -> Server
54+
// Client2Server,
55+
// /// Client <- Server
56+
// Server2Client,
57+
// }
5858

5959
type TcpReadHalf = ReadHalf<TcpStream>;
6060
type TcpWriteHalf = WriteHalf<TcpStream>;
@@ -366,52 +366,58 @@ pub fn proxy_handshake(
366366
}
367367

368368
/// Establish tunnel between server and client
369-
pub fn tunnel<CF, CFI, SF, SFI>(addr: Address, c2s: CF, s2c: SF) -> impl Future<Item = (), Error = io::Error> + Send
369+
// pub fn tunnel<CF, CFI, SF, SFI>(addr: Address, c2s: CF, s2c: SF) -> impl Future<Item = (), Error = io::Error> + Send
370+
pub fn tunnel<CF, CFI, SF, SFI>(c2s: CF, s2c: SF) -> impl Future<Item = (), Error = io::Error> + Send
370371
where
371372
CF: Future<Item = CFI, Error = io::Error> + Send + 'static,
372373
SF: Future<Item = SFI, Error = io::Error> + Send + 'static,
373374
{
374-
let addr = Arc::new(addr);
375-
376-
let cloned_addr = addr.clone();
377-
let c2s = c2s.then(move |res| {
378-
match res {
379-
Ok(..) => {
380-
// Continue reading response from remote server
381-
trace!("Relay {} client -> server is finished", cloned_addr);
382-
383-
Ok(TunnelDirection::Client2Server)
384-
}
385-
Err(err) => {
386-
error!("Relay {} client -> server aborted: {}", cloned_addr, err);
387-
Err(err)
388-
}
389-
}
390-
});
391-
392-
let cloned_addr = addr.clone();
393-
let s2c = s2c.then(move |res| match res {
394-
Ok(..) => {
395-
trace!("Relay {} client <- server is finished", cloned_addr);
396-
397-
Ok(TunnelDirection::Server2Client)
398-
}
399-
Err(err) => {
400-
error!("Relay {} client <- server aborted: {}", cloned_addr, err);
401-
Err(err)
402-
}
403-
});
404-
405-
c2s.select(s2c)
406-
.and_then(move |(dir, _)| {
407-
match dir {
408-
TunnelDirection::Server2Client => trace!("Relay {} client <- server is closed, abort connection", addr),
409-
TunnelDirection::Client2Server => trace!("Relay {} server -> client is closed, abort connection", addr),
410-
}
375+
c2s.map(|_| ()).select(s2c.map(|_| ())).then(|r| match r {
376+
Ok(..) => Ok(()),
377+
Err((err, _)) => Err(err),
378+
})
411379

412-
Ok(())
413-
})
414-
.map_err(|(err, _)| err)
380+
// let addr = Arc::new(addr);
381+
382+
// let cloned_addr = addr.clone();
383+
// let c2s = c2s.then(move |res| {
384+
// match res {
385+
// Ok(..) => {
386+
// // Continue reading response from remote server
387+
// trace!("Relay {} client -> server is finished", cloned_addr);
388+
389+
// Ok(TunnelDirection::Client2Server)
390+
// }
391+
// Err(err) => {
392+
// error!("Relay {} client -> server aborted: {}", cloned_addr, err);
393+
// Err(err)
394+
// }
395+
// }
396+
// });
397+
398+
// let cloned_addr = addr.clone();
399+
// let s2c = s2c.then(move |res| match res {
400+
// Ok(..) => {
401+
// trace!("Relay {} client <- server is finished", cloned_addr);
402+
403+
// Ok(TunnelDirection::Server2Client)
404+
// }
405+
// Err(err) => {
406+
// error!("Relay {} client <- server aborted: {}", cloned_addr, err);
407+
// Err(err)
408+
// }
409+
// });
410+
411+
// c2s.select(s2c)
412+
// .and_then(move |(dir, _)| {
413+
// match dir {
414+
// TunnelDirection::Server2Client => trace!("Relay {} client <- server is closed, abort connection", addr),
415+
// TunnelDirection::Client2Server => trace!("Relay {} server -> client is closed, abort connection", addr),
416+
// }
417+
418+
// Ok(())
419+
// })
420+
// .map_err(|(err, _)| err)
415421
}
416422

417423
/// Read until EOF, and ignore

‎src/relay/tcprelay/server.rs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,11 @@ where
144144
Item = TcpRelayClientConnected<impl Future<Item = EncryptedHalf, Error = io::Error> + Send + 'static>,
145145
Error = io::Error,
146146
> + Send {
147-
let addr = self.addr.clone();
148147
let client_pair = (self.r, self.w);
149148
let timeout = self.timeout;
150149
connect_remote(self.context, self.addr, self.timeout).map(move |stream| TcpRelayClientConnected {
151150
server: stream.split(),
152151
client: client_pair,
153-
addr: addr,
154152
timeout: timeout,
155153
})
156154
}
@@ -163,7 +161,6 @@ where
163161
{
164162
server: (ReadHalf<TcpStream>, WriteHalf<TcpStream>),
165163
client: (DecryptedHalf, E),
166-
addr: Address,
167164
timeout: Option<Duration>,
168165
}
169166

@@ -179,7 +176,6 @@ where
179176
let timeout = self.timeout;
180177

181178
tunnel(
182-
self.addr,
183179
r.copy_timeout_opt(svr_w, self.timeout),
184180
w_fut.and_then(move |w| w.copy_timeout_opt(svr_r, timeout)),
185181
)

‎src/relay/tcprelay/socks5_local.rs‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,8 @@ fn handle_socks5_connect(
3838
addr: Address,
3939
svr_cfg: Arc<ServerConfig>,
4040
) -> impl Future<Item = (), Error = io::Error> + Send {
41-
let cloned_addr = addr.clone();
42-
let cloned_svr_cfg = svr_cfg.clone();
4341
let timeout = svr_cfg.timeout();
44-
super::connect_proxy_server(context.clone(), svr_cfg)
42+
super::connect_proxy_server(context, svr_cfg.clone())
4543
.then(move |res| {
4644
let (header, r) = match res {
4745
Ok(svr_s) => {
@@ -70,21 +68,18 @@ fn handle_socks5_connect(
7068
}
7169
};
7270

73-
trace!("Send header: {:?}", header);
74-
try_timeout(try_timeout(header.write_to(w), timeout).and_then(flush), timeout).and_then(|w| match r {
71+
trace!("Sent header: {:?}", header);
72+
try_timeout(header.write_to(w).and_then(flush), timeout).and_then(|w| match r {
7573
Ok(svr_s) => Ok((svr_s, w)),
7674
Err(err) => Err(err),
7775
})
7876
})
7977
.and_then(move |(svr_s, w)| {
80-
let svr_cfg = cloned_svr_cfg;
8178
let timeout = svr_cfg.timeout();
8279
super::proxy_server_handshake(svr_s, svr_cfg, addr).and_then(move |(svr_r, svr_w)| {
83-
let cloned_timeout = timeout;
8480
let rhalf = svr_r.and_then(move |svr_r| svr_r.copy_timeout_opt(w, timeout));
85-
let whalf = svr_w.and_then(move |svr_w| svr_w.copy_timeout_opt(r, cloned_timeout));
86-
87-
tunnel(cloned_addr, whalf, rhalf)
81+
let whalf = svr_w.and_then(move |svr_w| svr_w.copy_timeout_opt(r, timeout));
82+
tunnel(whalf, rhalf)
8883
})
8984
})
9085
}
@@ -154,7 +149,11 @@ fn handle_socks5_client(
154149
match header.command {
155150
socks5::Command::TcpConnect => {
156151
debug!("CONNECT {}", addr);
157-
let fut = handle_socks5_connect(context, (r, w), cloned_client_addr, addr, conf);
152+
let fut =
153+
handle_socks5_connect(context, (r, w), cloned_client_addr, addr.clone(), conf).map_err(move |err| {
154+
error!("CONNECT {} failed with error: {}", addr, err);
155+
err
156+
});
158157
boxed_future(fut)
159158
}
160159
socks5::Command::TcpBind => {

0 commit comments

Comments
 (0)