🏷️ v1.11.2

Author: database64128

Cargo.lock

@@ -141,6 +141,3 @@ byteorder = "1.3"
 env_logger = "0.9"
 byte_string = "1.0"
 tokio = { version = "1", features = ["net", "time", "macros", "io-util"]}
-
-[patch.crates-io]
-tokio = { git = "https://github.com/tokio-rs/tokio.git" }

Cargo.toml

@@ -55,12 +55,12 @@ async-trait = "0.1"
 
 mio = "0.7"
 socket2 = { version = "0.4", features = ["all"] }
-tokio = { version = "1.5", features = ["io-util", "macros", "net", "parking_lot", "process", "rt", "sync", "time"] }
+tokio = { version = "1.9.0", features = ["io-util", "macros", "net", "parking_lot", "process", "rt", "sync", "time"] }
 tokio-io-timeout = "1.1"
 
 trust-dns-resolver = { version = "0.20", optional = true }
 arc-swap = { version = "1.3", optional = true }
-notify = { version = "5.0.0-pre.5", optional = true }
+notify = { version = "5.0.0-pre.11", optional = true }
 
 [target.'cfg(any(target_arch = "x86_64", target_arch = "aarch64"))'.dependencies]
 shadowsocks-crypto = { version = "0.2", features = ["ring"] }

crates/shadowsocks/Cargo.toml

@@ -135,6 +135,8 @@ cfg_if! {
 
 #[cfg(all(feature = "trust-dns", unix, not(target_os = "android")))]
 async fn trust_dns_notify_update_dns(resolver: Arc<TrustDnsSystemResolver>) -> notify::Result<()> {
+    use std::path::Path;
+
     use log::debug;
     use notify::{Event, EventKind, RecommendedWatcher, RecursiveMode, Result as NotifyResult, Watcher};
     use tokio::sync::watch;
@@ -144,7 +146,7 @@ async fn trust_dns_notify_update_dns(resolver: Arc<TrustDnsSystemResolver>) -> n
     let (tx, mut rx) = watch::channel::<Event>(Event::default());
 
     let mut watcher: RecommendedWatcher =
-        Watcher::new_immediate(move |ev_result: NotifyResult<Event>| match ev_result {
+        notify::recommended_watcher(move |ev_result: NotifyResult<Event>| match ev_result {
             Ok(ev) => {
                 trace!("received event {:?}", ev);
 
@@ -158,7 +160,7 @@ async fn trust_dns_notify_update_dns(resolver: Arc<TrustDnsSystemResolver>) -> n
         })?;
 
     // NOTE: It is an undefined behavior if this file get renamed or removed.
-    watcher.watch("/etc/resolv.conf", RecursiveMode::NonRecursive)?;
+    watcher.watch(Path::new("/etc/resolv.conf"), RecursiveMode::NonRecursive)?;
 
     while rx.changed().await.is_ok() {
         trace!("received notify /etc/resolv.conf changed");

crates/shadowsocks/src/dns_resolver/resolver.rs

@@ -1,3 +1,20 @@
+shadowsocks-rust (1.11.2) unstable; urgency=medium
+
+  ## Features
+
+  - Replaced `futures::future::abortable` with `tokio`'s builtin `tokio::task::JoinHandle::abort`
+  - Define binaries' exit code with standard in `sysexits.h`
+  - HTTP local listener supports `TCP_NODELAY`, `SO_KEEPALIVE` and dual-stack
+
+  ## Bug Fixed
+
+  - #577 `ssmanager` and `ssserver` command line argument `-u` should overwrite `mode` to be `Mode::UdpOnly`
+  - #566 Exit with error code instead of `panic!` when loading ACL fails
+  - #555 Properly handling `EINPROGRESS` for TFO connect when falling backs
+  - #557 Properly killing UDP associations, which may cause `Future` (memory) leaks
+
+ -- ty <zonyitoo@gmail.com>  Sat, 24 July 2021 11:50:00 +0800
+
 shadowsocks-rust (1.11.1) unstable; urgency=medium
 
   ## Features