a little fix

This commit is contained in:
Y. T. Chung
2015-06-19 11:12:35 +08:00
parent ef8b43ab22
commit 80b3eb46cf
2 changed files with 24 additions and 20 deletions
+1 -1
View File
@@ -22,7 +22,7 @@
#![crate_type = "lib"]
#![crate_name = "shadowsocks"]
#![feature(box_syntax, libc, core, collections, test, slice_patterns, lookup_host, convert, buf_stream)]
#![feature(box_syntax, libc, core, collections, test, slice_patterns, lookup_host, convert)]
extern crate rustc_serialize as serialize;
#[macro_use]
+23 -19
View File
@@ -198,6 +198,27 @@ impl TcpRelayLocal {
}
let addr_cloned = addr.clone();
Scheduler::spawn(move || {
match io::copy(&mut local_reader, &mut encrypt_stream) {
Ok(..) => {},
Err(err) => {
match err.kind() {
ErrorKind::BrokenPipe => {
debug!("{} relay from local to remote stream: {}", addr_cloned, err)
},
_ => {
error!("{} relay from local to remote stream: {}", addr_cloned, err)
}
}
}
}
let _ = encrypt_stream.get_ref().shutdown(Shutdown::Write);
let _ = local_reader.get_ref().shutdown(Shutdown::Read);
});
Scheduler::spawn(move|| {
let remote_iv = {
let mut iv = Vec::with_capacity(encrypt_method.block_size());
@@ -249,28 +270,11 @@ impl TcpRelayLocal {
Ok(..) => {},
}
let _ = local_writer.flush();
let _ = decrypt_stream.get_mut().shutdown(Shutdown::Read);
let _ = local_writer.shutdown(Shutdown::Write);
});
Scheduler::spawn(move || {
match io::copy(&mut local_reader, &mut encrypt_stream) {
Ok(..) => {},
Err(err) => {
match err.kind() {
ErrorKind::BrokenPipe => {
debug!("{} relay from local to remote stream: {}", addr_cloned, err)
},
_ => {
error!("{} relay from local to remote stream: {}", addr_cloned, err)
}
}
}
}
let _ = encrypt_stream.get_ref().shutdown(Shutdown::Write);
let _ = local_reader.get_ref().shutdown(Shutdown::Read);
});
},
socks5::Command::TcpBind => {
warn!("BIND is not supported");