source/shadowsocks-rust
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-rust.git synced 2026-02-09 01:59:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed partial relay by restoring select to join

Browse Source
This commit is contained in:
Y. T. Chung
2016-10-24 11:12:03 +08:00
parent 5c773b4226
commit 2945329744
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/relay/tcprelay/local.rs
View File

@@ -98,9 +98,9 @@ impl Socks5RelayLocal {
.and_then(move |(svr_r, svr_w, w)| {
let c2s = copy(r, svr_w);
let s2c = copy(svr_r, w);
c2s.select(s2c)
c2s.join(s2c)
.then(move |_| {
trace!("Relay {} is finished", cloned_addr);
trace!("Relay to {} is finished", cloned_addr);
Ok(())
})
})
@@ -248,9 +248,9 @@ impl HttpRelayServer {
.and_then(move |(svr_r, svr_w, w)| {
let c2s = copy(r, svr_w);
let s2c = copy(svr_r, w);
c2s.select(s2c)
c2s.join(s2c)
.then(move |_| {
trace!("Relay {} is finished", cloned_addr);
trace!("Relay to {} is finished", cloned_addr);
Ok(())
})
})