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

remove dummy relay struct

Browse Source
This commit is contained in:
Y. T. Chung
2016-11-03 02:05:40 +08:00
parent 5e5194014b
commit 688f693f41
15 changed files with 695 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/socks5.rs
+3 -3
View File
@@ -20,8 +20,8 @@ use futures::Future;
use shadowsocks::relay::tcprelay::client::Socks5Client;
use shadowsocks::config::{Config, ServerConfig};
use shadowsocks::crypto::CipherType;
use shadowsocks::relay::{RelayLocal, RelayServer};
use shadowsocks::relay::socks5::Address;
use shadowsocks::{run_local, run_server};
const SERVER_ADDR: &'static str = "127.0.0.1:8092";
const LOCAL_ADDR: &'static str = "127.0.0.1:8290";
@@ -44,7 +44,7 @@ fn start_server(bar: Arc<Barrier>) {
thread::spawn(move || {
drop(env_logger::init());
bar.wait();
RelayServer::run(get_config()).unwrap();
run_server(get_config()).unwrap();
});
}
@@ -52,7 +52,7 @@ fn start_local(bar: Arc<Barrier>) {
thread::spawn(move || {
drop(env_logger::init());
bar.wait();
RelayLocal::run(get_config()).unwrap();
run_local(get_config()).unwrap();
});
}
tests/udp.rs
+3 -3
View File
@@ -20,8 +20,8 @@ use futures::Future;
use shadowsocks::relay::tcprelay::client::Socks5Client;
use shadowsocks::config::{Config, ServerConfig};
use shadowsocks::crypto::CipherType;
use shadowsocks::relay::{RelayLocal, RelayServer};
use shadowsocks::relay::socks5::{Address, UdpAssociateHeader};
use shadowsocks::{run_local, run_server};
const SERVER_ADDR: &'static str = "127.0.0.1:8093";
const LOCAL_ADDR: &'static str = "127.0.0.1:8291";
@@ -48,7 +48,7 @@ fn start_server(bar: Arc<Barrier>) {
thread::spawn(move || {
drop(env_logger::init());
bar.wait();
RelayServer::run(get_config()).unwrap();
run_server(get_config()).unwrap();
});
}
@@ -56,7 +56,7 @@ fn start_local(bar: Arc<Barrier>) {
thread::spawn(move || {
drop(env_logger::init());
bar.wait();
RelayLocal::run(get_config()).unwrap();
run_local(get_config()).unwrap();
});
}