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

server side cannot reply error message

Browse Source
This commit is contained in:
Y. T. Chung
2014-10-23 20:28:03 +08:00
parent ad22c1878f
commit b591e8c235
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/relay/tcprelay/server.rs
View File

@@ -32,8 +32,6 @@ use std::io::{EndOfFile, TimedOut};
use config::{Config, SingleServer, MultipleServer}; use config::{Config, SingleServer, MultipleServer};
use relay::Relay; use relay::Relay;
use relay::{parse_request_header, Sock5SocketAddr, Sock5DomainNameAddr}; use relay::{parse_request_header, Sock5SocketAddr, Sock5DomainNameAddr};
use relay::tcprelay::send_error_reply;
use relay::{SOCKS5_REPLY_HOST_UNREACHABLE};
use crypto::cipher; use crypto::cipher;
use crypto::cipher::Cipher; use crypto::cipher::Cipher;
@@ -188,8 +186,7 @@ impl Relay for TcpRelayServer {
let (_, addr) = match parse_request_header(header.as_slice()) { let (_, addr) = match parse_request_header(header.as_slice()) {
Ok((header_len, addr)) => (header_len, addr), Ok((header_len, addr)) => (header_len, addr),
Err(err_code) => { Err(err_code) => {
send_error_reply(&mut stream, err_code); fail!("Error occurs while parsing request header: {}", err_code);
fail!("Error occurs while parsing request header");
} }
}; };
info!("Connecting to {}", addr); info!("Connecting to {}", addr);
@@ -198,7 +195,6 @@ impl Relay for TcpRelayServer {
match TcpStream::connect(sockaddr.ip.to_string().as_slice(), sockaddr.port) { match TcpStream::connect(sockaddr.ip.to_string().as_slice(), sockaddr.port) {
Ok(s) => s, Ok(s) => s,
Err(err) => { Err(err) => {
send_error_reply(&mut stream, SOCKS5_REPLY_HOST_UNREACHABLE);
fail!("Unable to connect {}: {}", sockaddr, err) fail!("Unable to connect {}: {}", sockaddr, err)
} }
} }
@@ -207,20 +203,17 @@ impl Relay for TcpRelayServer {
let addrs = match get_host_addresses(domainaddr.domain_name.as_slice()) { let addrs = match get_host_addresses(domainaddr.domain_name.as_slice()) {
Ok(ipaddrs) => ipaddrs, Ok(ipaddrs) => ipaddrs,
Err(e) => { Err(e) => {
send_error_reply(&mut stream, SOCKS5_REPLY_HOST_UNREACHABLE);
fail!("Error occurs while get_host_addresses: {}", e); fail!("Error occurs while get_host_addresses: {}", e);
} }
}; };
if addrs.len() == 0 { if addrs.len() == 0 {
send_error_reply(&mut stream, SOCKS5_REPLY_HOST_UNREACHABLE);
fail!("Cannot resolve host {}, empty host list", domainaddr.domain_name); fail!("Cannot resolve host {}, empty host list", domainaddr.domain_name);
} }
match TcpRelayServer::connect_remote(addrs, domainaddr.port) { match TcpRelayServer::connect_remote(addrs, domainaddr.port) {
Some(s) => s, Some(s) => s,
None => { None => {
send_error_reply(&mut stream, SOCKS5_REPLY_HOST_UNREACHABLE);
fail!("Unable to resolve host {}", domainaddr) fail!("Unable to resolve host {}", domainaddr)
} }
} }