diff --git a/Cargo.toml b/Cargo.toml index d9237c9e..1cf0d385 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,7 +70,6 @@ rand = "^0.3.9" time = "^0.1.32" clap = "^1.1.6" fern = "^0.3.5" -simplesched = "^0.1.0" qrcode = "^0.1.6" hyper = "^0.6.9" @@ -81,3 +80,6 @@ optional = true [dependencies.lru-cache] git = "https://github.com/zonyitoo/lru-cache.git" ver = "7688eae5a4ce8e6f9beb075e11d1abb3d2b2f635" + +[dependencies.coio] +git = "https://github.com/zonyitoo/coio-rs.git" diff --git a/src/bin/local.rs b/src/bin/local.rs index f21c2ed3..f8dae55e 100644 --- a/src/bin/local.rs +++ b/src/bin/local.rs @@ -35,7 +35,7 @@ extern crate log; extern crate fern; extern crate time; extern crate hyper; -extern crate simplesched; +extern crate coio; use clap::{App, Arg}; @@ -47,7 +47,7 @@ use shadowsocks::config::{Config, ServerConfig, self}; use shadowsocks::config::DEFAULT_DNS_CACHE_CAPACITY; use shadowsocks::relay::{RelayLocal, Relay}; -use simplesched::net::http::Server; +use coio::net::http::Server; fn main() { let matches = App::new("shadowsocks") diff --git a/src/lib.rs b/src/lib.rs index 13beec04..9143f6dc 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -35,7 +35,7 @@ extern crate libsodium_sys as libsodium_ffi; extern crate byteorder; extern crate rand; -extern crate simplesched; +extern crate coio; pub const VERSION: &'static str = env!("CARGO_PKG_VERSION"); diff --git a/src/relay/local.rs b/src/relay/local.rs index a268d469..3b9310eb 100644 --- a/src/relay/local.rs +++ b/src/relay/local.rs @@ -21,7 +21,7 @@ //! Local side -use simplesched::Scheduler; +use coio::Scheduler; use relay::Relay; use relay::tcprelay::local::TcpRelayLocal; diff --git a/src/relay/server.rs b/src/relay/server.rs index 5f5f5c49..991a609b 100644 --- a/src/relay/server.rs +++ b/src/relay/server.rs @@ -21,7 +21,7 @@ //! Server side -use simplesched::Scheduler; +use coio::Scheduler; #[cfg(feature = "enable-udp")] use relay::udprelay::server::UdpRelayServer; diff --git a/src/relay/tcprelay/cached_dns.rs b/src/relay/tcprelay/cached_dns.rs index 911efeea..41a3b8c7 100644 --- a/src/relay/tcprelay/cached_dns.rs +++ b/src/relay/tcprelay/cached_dns.rs @@ -25,7 +25,7 @@ use std::net::lookup_host; use std::net::SocketAddr; use std::io; -use simplesched::sync::Mutex; +use coio::sync::Mutex; use lru_cache::LruCache; diff --git a/src/relay/tcprelay/local.rs b/src/relay/tcprelay/local.rs index 3fef283c..da29e589 100644 --- a/src/relay/tcprelay/local.rs +++ b/src/relay/tcprelay/local.rs @@ -26,8 +26,8 @@ use std::net::lookup_host; use std::io::{self, BufWriter, BufReader, ErrorKind, Read, Write}; use std::collections::BTreeMap; -use simplesched::Scheduler; -use simplesched::net::{TcpListener, TcpStream, Shutdown}; +use coio::Scheduler; +use coio::net::{TcpListener, TcpStream, Shutdown}; use config::Config; diff --git a/src/relay/tcprelay/server.rs b/src/relay/tcprelay/server.rs index 3d7348d7..9b7580d1 100644 --- a/src/relay/tcprelay/server.rs +++ b/src/relay/tcprelay/server.rs @@ -24,8 +24,8 @@ use std::sync::Arc; use std::io::{self, Read, Write, BufReader, ErrorKind}; -use simplesched::Scheduler; -use simplesched::net::{TcpListener, TcpStream, Shutdown}; +use coio::Scheduler; +use coio::net::{TcpListener, TcpStream, Shutdown}; use config::{Config, ServerConfig}; use relay::socks5; diff --git a/src/relay/udprelay/local.rs b/src/relay/udprelay/local.rs index 5d773001..b0f47302 100644 --- a/src/relay/udprelay/local.rs +++ b/src/relay/udprelay/local.rs @@ -59,8 +59,8 @@ use std::net::{SocketAddr, lookup_host}; use std::collections::HashMap; use std::io::{BufReader, self}; -use simplesched::Scheduler; -use simplesched::net::UdpSocket; +use coio::Scheduler; +use coio::net::UdpSocket; use lru_cache::LruCache; diff --git a/src/relay/udprelay/server.rs b/src/relay/udprelay/server.rs index 729c40ea..bd77e81b 100644 --- a/src/relay/udprelay/server.rs +++ b/src/relay/udprelay/server.rs @@ -25,7 +25,7 @@ use std::io::{BufReader, Read}; use lru_cache::LruCache; -use simplesched::Scheduler; +use coio::Scheduler; use config::{Config, ServerConfig}; use relay::socks5::{Address, self};