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

compile with nightly

Browse Source
This commit is contained in:
Y. T. Chung
2014-11-06 21:43:13 +08:00
parent 6201ac46ed
commit 86f8a5151a
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/crypto/table.rs
+1 -1
View File
@@ -50,7 +50,7 @@ impl TableCipher {
for i in range(1, 1024) {
table.as_mut_slice().sort_by(|x, y| {
let sub = (a % (x + i) - a % (y + i)) as i64;
let sub = (a % (*x + i) - a % (*y + i)) as i64;
sub.partial_cmp(&0i64).unwrap()
})
src/relay/tcprelay/local.rs
+16 -14
View File
@@ -106,20 +106,21 @@ impl TcpRelayLocal {
socks5::TcpConnect => {
info!("CONNECT {}", addr);
let mut remote_stream = TcpStream::connect(server_addr.ip.to_string().as_slice(),
server_addr.port).unwrap_or_else(|err| {
match err.kind {
ConnectionAborted | ConnectionReset | ConnectionRefused | ConnectionFailed => {
socks5::TcpResponseHeader::new(socks5::HostUnreachable, addr.clone())
.write_to(&mut stream).unwrap();
},
_ => {
socks5::TcpResponseHeader::new(socks5::NetworkUnreachable, addr.clone())
.write_to(&mut stream).unwrap();
let mut remote_stream = TcpStream::connect(
format!("{}:{}", server_addr.ip, server_addr.port).as_slice())
.unwrap_or_else(|err| {
match err.kind {
ConnectionAborted | ConnectionReset | ConnectionRefused | ConnectionFailed => {
socks5::TcpResponseHeader::new(socks5::HostUnreachable, addr.clone())
.write_to(&mut stream).unwrap();
},
_ => {
socks5::TcpResponseHeader::new(socks5::NetworkUnreachable, addr.clone())
.write_to(&mut stream).unwrap();
}
}
}
panic!("Failed to connect remote server: {}", err);
});
panic!("Failed to connect remote server: {}", err);
});
let mut cipher = cipher::with_name(encrypt_method.as_slice(),
password.as_slice().as_bytes())
@@ -208,7 +209,8 @@ impl Relay for TcpRelayLocal {
let local_conf = self.config.local.unwrap();
let mut acceptor = match TcpListener::bind(local_conf.ip.to_string().as_slice(), local_conf.port).listen() {
let mut acceptor = match TcpListener::bind(
format!("{}:{}", local_conf.ip, local_conf.port).as_slice()).listen() {
Ok(acpt) => acpt,
Err(e) => {
panic!("Error occurs while listening local address: {}", e.to_string());
src/relay/tcprelay/server.rs
+2 -2
View File
@@ -60,8 +60,8 @@ impl TcpRelayServer {
s.timeout,
s.dns_cache_capacity);
let mut acceptor = TcpListener::bind(server_addr.ip.to_string().as_slice(),
server_addr.port).listen().unwrap();
let mut acceptor = TcpListener::bind(format!("{}:{}", server_addr.ip,
server_addr.port).as_slice()).listen().unwrap();
info!("Shadowsocks listening on {}", server_addr);