Fixed bug, UDP relay must be started before plugin

Author: zonyitoo

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "shadowsocks-rust"
-version = "1.7.0-alpha.4"
+version = "1.7.0-alpha.5"
 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

@@ -176,7 +176,7 @@ For DNS relay server, you can set remote DNS server in configuration file with `
 
 ```json
 {
-    "dns": "8.8.8.8:53"
+    "dns": "8.8.8.8"
 }
 ```
 

README.md

@@ -28,21 +28,30 @@ use relay::udprelay::local::run as run_udp;
 /// run(config);
 /// ```
 pub fn run(mut config: Config) {
-    // Hold it here, kill all plugins when Core is finished
+    let mut vf = Vec::new();
+
+    if config.enable_udp {
+        // Clone config here, because the config for TCP relay will be modified
+        // after plugins started
+        let udp_config = Arc::new(config.clone());
+
+        // Run UDP relay before starting plugins
+        // Because plugins doesn't support UDP relay
+        let udp_fut = run_udp(udp_config);
+        vf.push(boxed_future(udp_fut));
+    }
+
+    // Hold it here, kill all plugins when `tokio::run` is finished
     let plugins = launch_plugin(&mut config, PluginMode::Client).expect("Failed to launch plugins");
     let mon = ::monitor::monitor_signal(plugins);
 
+    // Recreate shared config here
     let config = Arc::new(config);
 
-    let enable_udp = config.enable_udp;
-
     let tcp_fut = run_tcp(config.clone());
-    let mut vf = vec![boxed_future(mon), boxed_future(tcp_fut)];
-    if enable_udp {
-        let udp_fut = run_udp(config);
-        vf.push(boxed_future(udp_fut));
-    }
 
+    vf.push(boxed_future(mon));
+    vf.push(boxed_future(tcp_fut));
     tokio::run(join_all(vf).then(|res| match res {
                                      Ok(..) => Ok(()),
                                      Err(err) => panic!("Failed to run server, err: {}", err),

src/relay/local.rs

@@ -28,19 +28,30 @@ use relay::udprelay::server::run as run_udp;
 /// ```
 ///
 pub fn run(mut config: Config) {
-    // Hold it here, kill all plugins when Core is finished
+    let mut vf = Vec::new();
+
+    if config.enable_udp {
+        // Clone config here, because the config for TCP relay will be modified
+        // after plugins started
+        let udp_config = Arc::new(config.clone());
+
+        // Run UDP relay before starting plugins
+        // Because plugins doesn't support UDP relay
+        let udp_fut = run_udp(udp_config);
+        vf.push(boxed_future(udp_fut));
+    }
+
+    // Hold it here, kill all plugins when `tokio::run` is finished
     let plugins = launch_plugin(&mut config, PluginMode::Server).expect("Failed to launch plugins");
     let mon = ::monitor::monitor_signal(plugins);
 
+    // Recreate shared config here
     let config = Arc::new(config);
-    let enable_udp = config.enable_udp;
 
     let tcp_fut = run_tcp(config.clone());
-    let mut vf = vec![boxed_future(mon), boxed_future(tcp_fut)];
-    if enable_udp {
-        let udp_fut = run_udp(config);
-        vf.push(boxed_future(udp_fut));
-    }
+
+    vf.push(boxed_future(mon));
+    vf.push(boxed_future(tcp_fut));
 
     tokio::run(join_all(vf).then(|res| match res {
                                      Ok(..) => Ok(()),