diff --git a/crates/shadowsocks-service/src/config.rs b/crates/shadowsocks-service/src/config.rs index e6db99f8..cbc1ddb5 100644 --- a/crates/shadowsocks-service/src/config.rs +++ b/crates/shadowsocks-service/src/config.rs @@ -1184,17 +1184,7 @@ impl Config { } #[cfg(feature = "local-dns")] - if self.local_protocol == ProtocolType::Dns { - if self.dns_bind_addr.is_none() || self.local_dns_addr.is_none() || self.remote_dns_addr.is_none() { - let err = Error::new( - ErrorKind::MissingField, - "missing `dns_bind_addr`, `local_dns_addr` or `remote_dns_addr` in configuration", - None, - ); - return Err(err); - } - } else if self.dns_bind_addr.is_some() { - // Run a DNS server in the same process + if self.local_protocol == ProtocolType::Dns || self.dns_bind_addr.is_some() { if self.local_dns_addr.is_none() || self.remote_dns_addr.is_none() { let err = Error::new( ErrorKind::MissingField, diff --git a/crates/shadowsocks-service/src/local/dns/dns_resolver.rs b/crates/shadowsocks-service/src/local/dns/dns_resolver.rs index 9619efea..6fda5705 100644 --- a/crates/shadowsocks-service/src/local/dns/dns_resolver.rs +++ b/crates/shadowsocks-service/src/local/dns/dns_resolver.rs @@ -210,6 +210,11 @@ impl DnsResolve for DnsResolver { } } + if vaddr.is_empty() { + let err = io::Error::new(ErrorKind::InvalidData, "resolve empty"); + return Err(err); + } + Ok(vaddr) } }