Upgrade trust-dns to alpha.3 and bump version to v1.8.0-alpha.3

Author: zonyitoo

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "shadowsocks-rust"
-version = "1.8.0-alpha.2"
+version = "1.8.0-alpha.3"
 authors = ["Y. T. CHUNG <zonyitoo@gmail.com>"]
 description = "shadowsocks is a fast tunnel proxy that helps you bypass firewalls."
 repository = "https://github.com/zonyitoo/shadowsocks-rust"

Cargo.toml

@@ -11,16 +11,14 @@ use futures::{
 };
 use log::{debug, error, info};
 use std::net::SocketAddr;
-use tokio;
+use tokio::runtime::Builder;
 
 use shadowsocks::{plugin::PluginConfig, run_local, Config, ConfigType, Mode, ServerAddr, ServerConfig};
 
 mod logging;
 mod monitor;
 
-#[cfg_attr(feature = "single-threaded", tokio::main(basic_scheduler))]
-#[cfg_attr(not(feature = "single-threaded"), tokio::main)]
-async fn main() {
+fn main() {
     let matches = App::new("shadowsocks")
         .version(shadowsocks::VERSION)
         .about("A fast tunnel proxy that helps you bypass firewalls.")
@@ -208,11 +206,21 @@ async fn main() {
 
     debug!("Config: {:?}", config);
 
-    let abort_signal = monitor::create_signal_monitor();
-    match future::select(run_local(config).boxed(), abort_signal.boxed()).await {
-        // Server future resolved without an error. This should never happen.
-        Either::Left(_) => panic!("Server exited unexpectly"),
-        // The abort signal future resolved. Means we should just exit.
-        Either::Right(_) => (),
+    let mut builder = Builder::new();
+    if cfg!(feature = "single-threaded") {
+        builder.basic_scheduler();
+    } else {
+        builder.threaded_scheduler();
     }
+    let mut runtime = builder.enable_all().build().expect("Unable to create Tokio Runtime");
+    let rt_handle = runtime.handle().clone();
+    runtime.block_on(async move {
+        let abort_signal = monitor::create_signal_monitor();
+        match future::select(run_local(config, rt_handle).boxed(), abort_signal.boxed()).await {
+            // Server future resolved without an error. This should never happen.
+            Either::Left(_) => panic!("Server exited unexpectly"),
+            // The abort signal future resolved. Means we should just exit.
+            Either::Right(_) => (),
+        }
+    })
 }

src/bin/local.rs

@@ -13,16 +13,14 @@ use futures::{
     FutureExt,
 };
 use log::{debug, error, info};
-use tokio;
+use tokio::runtime::Builder;
 
 use shadowsocks::{plugin::PluginConfig, run_server, Config, ConfigType, Mode, ServerAddr, ServerConfig};
 
 mod logging;
 mod monitor;
 
-#[cfg_attr(feature = "single-threaded", tokio::main(basic_scheduler))]
-#[cfg_attr(not(feature = "single-threaded"), tokio::main)]
-async fn main() {
+fn main() {
     let matches = App::new("shadowsocks")
         .version(shadowsocks::VERSION)
         .about("A fast tunnel proxy that helps you bypass firewalls.")
@@ -191,11 +189,22 @@ async fn main() {
 
     debug!("Config: {:?}", config);
 
-    let abort_signal = monitor::create_signal_monitor();
-    match future::select(run_server(config).boxed(), abort_signal.boxed()).await {
-        // Server future resolved without an error. This should never happen.
-        Either::Left(_) => panic!("Server exited unexpectly"),
-        // The abort signal future resolved. Means we should just exit.
-        Either::Right(_) => (),
+    let mut builder = Builder::new();
+    if cfg!(feature = "single-threaded") {
+        builder.basic_scheduler();
+    } else {
+        builder.threaded_scheduler();
     }
+    let mut runtime = builder.enable_all().build().expect("Unable to create Tokio Runtime");
+    let rt_handle = runtime.handle().clone();
+
+    runtime.block_on(async move {
+        let abort_signal = monitor::create_signal_monitor();
+        match future::select(run_server(config, rt_handle).boxed(), abort_signal.boxed()).await {
+            // Server future resolved without an error. This should never happen.
+            Either::Left(_) => panic!("Server exited unexpectly"),
+            // The abort signal future resolved. Means we should just exit.
+            Either::Right(_) => (),
+        }
+    })
 }

src/bin/server.rs

@@ -11,7 +11,7 @@ use futures::{
 };
 use log::{debug, error, info};
 use std::net::SocketAddr;
-use tokio;
+use tokio::runtime::Builder;
 
 use shadowsocks::{
     plugin::PluginConfig,
@@ -27,9 +27,7 @@ use shadowsocks::{
 mod logging;
 mod monitor;
 
-#[cfg_attr(feature = "single-threaded", tokio::main(basic_scheduler))]
-#[cfg_attr(not(feature = "single-threaded"), tokio::main)]
-async fn main() {
+fn main() {
     let matches = App::new("shadowsocks")
         .version(shadowsocks::VERSION)
         .about("A fast tunnel proxy that helps you bypass firewalls.")
@@ -230,11 +228,22 @@ async fn main() {
 
     debug!("Config: {:?}", config);
 
-    let abort_signal = monitor::create_signal_monitor();
-    match future::select(run_local(config).boxed(), abort_signal.boxed()).await {
-        // Server future resolved without an error. This should never happen.
-        Either::Left(_) => panic!("Server exited unexpectly"),
-        // The abort signal future resolved. Means we should just exit.
-        Either::Right(_) => (),
+    let mut builder = Builder::new();
+    if cfg!(feature = "single-threaded") {
+        builder.basic_scheduler();
+    } else {
+        builder.threaded_scheduler();
     }
+    let mut runtime = builder.enable_all().build().expect("Unable to create Tokio Runtime");
+    let rt_handle = runtime.handle().clone();
+
+    runtime.block_on(async move {
+        let abort_signal = monitor::create_signal_monitor();
+        match future::select(run_local(config, rt_handle).boxed(), abort_signal.boxed()).await {
+            // Server future resolved without an error. This should never happen.
+            Either::Left(_) => panic!("Server exited unexpectly"),
+            // The abort signal future resolved. Means we should just exit.
+            Either::Right(_) => (),
+        }
+    })
 }