source/shadowsocks-rust
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-rust.git synced 2026-02-09 01:59:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(local-dns): DNS client cache create DnsClient only when missed

Browse Source
This commit is contained in:
zonyitoo
2025-05-12 02:55:42 +08:00
parent c9f47c6db3
commit 34ebd07a4d
1 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
crates/shadowsocks-service/src/local/dns/client_cache.rs
View File

@@ -115,37 +115,46 @@ impl DnsClientCache {
svr_cfg: Option<&ServerConfig>,
) -> Result<Message, ProtoError> {
let mut last_err = None;
let mut dns_res: io::Result<DnsClient>;
for _ in 0..self.retry_count {
match dck {
DnsClientKey::TcpLocal(tcp_l) => {
dns_res = DnsClient::connect_tcp_local(*tcp_l, connect_opts.unwrap()).await;
let create_fn = async {
match dck {
DnsClientKey::TcpLocal(tcp_l) => {
let connect_opts = connect_opts.expect("connect options is required for local DNS");
DnsClient::connect_tcp_local(*tcp_l, connect_opts).await
}
DnsClientKey::UdpLocal(udp_l) => {
let connect_opts = connect_opts.expect("connect options is required for local DNS");
DnsClient::connect_udp_local(*udp_l, connect_opts).await
}
DnsClientKey::TcpRemote(tcp_l) => {
let context = context.expect("context is required for remote DNS");
let svr_cfg = svr_cfg.expect("server config is required for remote DNS");
DnsClient::connect_tcp_remote(
context.context(),
svr_cfg,
tcp_l,
context.connect_opts_ref(),
context.flow_stat(),
)
.await
}
DnsClientKey::UdpRemote(udp_l) => {
let context = context.expect("context is required for remote DNS");
let svr_cfg = svr_cfg.expect("server config is required for remote DNS");
DnsClient::connect_udp_remote(
context.context(),
svr_cfg,
udp_l.clone(),
context.connect_opts_ref(),
context.flow_stat(),
)
.await
}
}
DnsClientKey::UdpLocal(udp_l) => {
dns_res = DnsClient::connect_udp_local(*udp_l, connect_opts.unwrap()).await;
}
DnsClientKey::TcpRemote(tcp_l) => {
dns_res = DnsClient::connect_tcp_remote(
context.unwrap().context(),
svr_cfg.unwrap(),
tcp_l,
context.unwrap().connect_opts_ref(),
context.unwrap().flow_stat(),
)
.await;
}
DnsClientKey::UdpRemote(udp_l) => {
dns_res = DnsClient::connect_udp_remote(
context.unwrap().context(),
svr_cfg.unwrap(),
udp_l.clone(),
context.unwrap().connect_opts_ref(),
context.unwrap().flow_stat(),
)
.await;
}
}
match self.get_client_or_create(dck, async { dns_res }).await {
};
match self.get_client_or_create(dck, create_fn).await {
Ok(mut client) => match client.lookup_timeout(msg.clone(), self.timeout).await {
Ok(msg) => {
self.save_client(dck.clone(), client).await;