diff --git a/README.md b/README.md index bba9c00761c4..aa0007710e48 100644 --- a/README.md +++ b/README.md @@ -597,8 +597,6 @@ Example configuration: "remote_dns_address": "8.8.8.8", // OPTIONAL. Remote DNS's port, 53 by default "remote_dns_port": 53, - // OPTIONAL. DNS Client Cache (TCP & UDP sockets) - "client_cache_size": 5 }, { // Tun local server (feature = "local-tun") diff --git a/crates/shadowsocks-service/src/config.rs b/crates/shadowsocks-service/src/config.rs index 867c7eac0dbf..61ebb13f43cb 100644 --- a/crates/shadowsocks-service/src/config.rs +++ b/crates/shadowsocks-service/src/config.rs @@ -66,14 +66,7 @@ use serde::{Deserialize, Serialize}; use shadowsocks::relay::socks5::Address; use shadowsocks::{ config::{ - ManagerAddr, - Mode, - ReplayAttackPolicy, - ServerAddr, - ServerConfig, - ServerUser, - ServerUserManager, - ServerWeight, + ManagerAddr, Mode, ReplayAttackPolicy, ServerAddr, ServerConfig, ServerUser, ServerUserManager, ServerWeight, }, crypto::CipherKind, plugin::PluginConfig, @@ -1553,11 +1546,6 @@ impl Config { }); } - #[cfg(feature = "local-dns")] - { - local_config.client_cache_size = local.client_cache_size; - } - #[cfg(feature = "local-tun")] if let Some(tun_interface_address) = local.tun_interface_address { match tun_interface_address.parse::() { @@ -2469,8 +2457,6 @@ impl fmt::Display for Config { Address::DomainNameAddress(.., port) => Some(*port), }, }, - #[cfg(feature = "local-dns")] - client_cache_size: local.client_cache_size.clone(), #[cfg(feature = "local-tun")] tun_interface_name: local.tun_interface_name.clone(), #[cfg(feature = "local-tun")] diff --git a/crates/shadowsocks-service/src/local/mod.rs b/crates/shadowsocks-service/src/local/mod.rs index dc99074c266d..35ebe81f97d0 100644 --- a/crates/shadowsocks-service/src/local/mod.rs +++ b/crates/shadowsocks-service/src/local/mod.rs @@ -353,7 +353,7 @@ impl Server { let mut server_builder = { let local_addr = local_config.local_dns_addr.expect("missing local_dns_addr"); let remote_addr = local_config.remote_dns_addr.expect("missing remote_dns_addr"); - let client_cache_size = local_config.client_cache_size.unwrap_or_else(5); + let client_cache_size = local_config.client_cache_size.unwrap_or(5); DnsBuilder::with_context( context.clone(), diff --git a/homebrew/shadowsocks-rust.rb b/homebrew/shadowsocks-rust.rb index c180fa334a3b..b78acf0adf99 100644 --- a/homebrew/shadowsocks-rust.rb +++ b/homebrew/shadowsocks-rust.rb @@ -1,8 +1,8 @@ class ShadowsocksRust < Formula desc "Rust port of Shadowsocks" homepage "https://github.com/shadowsocks/shadowsocks-rust" - url "https://github.com/shadowsocks/shadowsocks-rust/archive/v1.16.1.tar.gz" - sha256 "da4c6256247207b2579721046292bab1a2ac62301878c73ff778c168caa8a990" + url "https://github.com/shadowsocks/shadowsocks-rust/archive/v1.16.2.tar.gz" + sha256 "04fb797d8d04b8af9c4746ab9c1d659a3575a677892c2d5d9194a4b0e210e2ab" license "MIT" head "https://github.com/shadowsocks/shadowsocks-rust.git", branch: "master"