🐛 Fix nameserver subnet not work

Cargo.toml

@@ -129,12 +129,12 @@ tracing-subscriber = { version = "0.3", features = [
 # tracing-appender = "0.2"
 
 # hickory dns
-hickory-proto = { git = "https://github.com/mokeyish/hickory-dns.git", rev = "5a41208", version = "0.24", features = ["serde-config"]}
-hickory-resolver = { git = "https://github.com/mokeyish/hickory-dns.git", rev = "5a41208", version = "0.24", features = [
+hickory-proto = { git = "https://github.com/mokeyish/hickory-dns.git", rev = "bbf1262", version = "0.24", features = ["serde-config"]}
+hickory-resolver = { git = "https://github.com/mokeyish/hickory-dns.git", rev = "bbf1262", version = "0.24", features = [
   "serde-config",
   "system-config",
 ] }
-hickory-server = { git = "https://github.com/mokeyish/hickory-dns.git", rev = "5a41208", version = "0.24", features = ["resolver"], optional = true }
+hickory-server = { git = "https://github.com/mokeyish/hickory-dns.git", rev = "bbf1262", version = "0.24", features = ["resolver"], optional = true }
 
 # ssl
 webpki-roots = "0.25.2"

src/dns_client.rs

@@ -1,5 +1,6 @@
 use std::{
     collections::{HashMap, HashSet},
+    hash::{DefaultHasher, Hash, Hasher},
     net::{IpAddr, SocketAddr},
     ops::Deref,
     path::PathBuf,
@@ -434,7 +435,7 @@ impl GenericResolver for NameServerGroup {
 
 pub struct NameServerFactory {
     tls_client_config: TlsClientConfigBundle,
-    cache: RwLock<HashMap<String, Arc<NameServer>>>,
+    cache: RwLock<HashMap<u64, Arc<NameServer>>>,
 }
 
 impl NameServerFactory {
@@ -455,14 +456,15 @@ impl NameServerFactory {
     ) -> Arc<NameServer> {
         use crate::libdns::resolver::name_server::NameServer as N;
 
-        let key = format!(
-            "{}: {}{:?}#{}@{}",
-            url.proto(),
-            **url,
-            proxy.as_ref().map(|s| s.to_string()),
-            so_mark.unwrap_or_default(),
-            device.as_deref().unwrap_or_default(),
-        );
+        let key = {
+            let mut hasher = DefaultHasher::new();
+            url.hash(&mut hasher);
+            proxy.hash(&mut hasher);
+            so_mark.hash(&mut hasher);
+            device.hash(&mut hasher);
+            resolver_opts.hash(&mut hasher);
+            hasher.finish()
+        };
 
         if let Some(ns) = self.cache.read().await.get(&key) {
             return ns.clone();
@@ -714,7 +716,7 @@ impl GenericResolver for NameServer {
     }
 }
 
-#[derive(Clone)]
+#[derive(Clone, Hash)]
 pub struct NameServerOpts {
     /// filter result with blacklist ip
     pub blacklist_ip: bool,

src/proxy.rs

@@ -138,7 +138,7 @@ impl Deref for UdpSocket {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ProxyConfig {
     pub proto: ProxyProtocol,
     pub server: SocketAddr,
@@ -210,7 +210,7 @@ impl FromStr for ProxyConfig {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub enum ProxyProtocol {
     Socks5,
     Http,