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

simple optimize

Browse Source
This commit is contained in:
Y. T. Chung
2016-11-03 02:11:49 +08:00
parent 688f693f41
commit 310cecc312
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/relay/local.rs
View File

@@ -26,12 +26,11 @@ use std::io;
use tokio_core::reactor::Core;
use futures::{self, Future};
use futures::Future;
use relay::tcprelay::local::run as run_tcp;
use relay::udprelay::local::run as run_udp;
use relay::dns_resolver::DnsResolver;
use relay::boxed_future;
use config::Config;
/// Relay server running under local environment.
@@ -57,13 +56,9 @@ pub fn run(config: Config) -> io::Result<()> {
let tcp_fut = run_tcp(config.clone(), handle.clone(), dns_resolver.clone());
let udp_fut = if config.enable_udp {
run_udp(config, handle, dns_resolver)
if config.enable_udp {
lp.run(tcp_fut.join(run_udp(config, handle, dns_resolver)).map(|_| ()))
} else {
boxed_future(futures::finished(()))
};
let join = tcp_fut.join(udp_fut).map(|_| ());
lp.run(join)
lp.run(tcp_fut)
}
}

13
src/relay/server.rs
View File

@@ -26,12 +26,11 @@ use std::io;
use tokio_core::reactor::Core;
use futures::{self, Future};
use futures::Future;
use relay::udprelay::server::run as run_udp;
use relay::tcprelay::server::run as run_tcp;
use relay::dns_resolver::DnsResolver;
use relay::boxed_future;
use config::Config;
/// Relay server running on server side.
@@ -59,11 +58,9 @@ pub fn run(config: Config) -> io::Result<()> {
let tcp_fut = run_tcp(config.clone(), handle.clone(), dns_resolver.clone());
let udp_fut = if config.enable_udp {
run_udp(config, handle, dns_resolver)
if config.enable_udp {
lp.run(tcp_fut.join(run_udp(config, handle, dns_resolver)).map(|_| ()))
} else {
boxed_future(futures::finished(()))
};
lp.run(tcp_fut.join(udp_fut).map(|_| ()))
lp.run(tcp_fut)
}
}