vrr/g3
2
0
Fork 0
mirror of https://github.com/bytedance/g3.git synced 2026-05-11 13:10:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

g3-resolver: use returned answers before try cname

Browse source
This commit is contained in:
Zhang Jingqiang 2024-03-11 10:40:49 +08:00
parent 2557416e6c
commit b6c8a7441f
3 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
demo/test-resolver/src/main.rs
View file

@ -16,6 +16,7 @@
use std::net::IpAddr;
use std::str::FromStr;
use std::sync::Arc;
use log::info;
use slog::{slog_o, Drain};
@ -54,10 +55,10 @@ fn main() {
};
let resolver = ResolverBuilder::new(config).build().unwrap();
let handle = resolver.get_handle();
let mut job = handle.get_v4("www.xjtu.edu.cn".to_string()).unwrap();
let mut job = handle.get_v4(Arc::from("www.xjtu.edu.cn")).unwrap();
let data = job.recv().await;
info!("v4 data: {:?}", data);
let mut job = handle.get_v6("www.xjtu.edu.cn".to_string()).unwrap();
let mut job = handle.get_v6(Arc::from("www.xjtu.edu.cn")).unwrap();
let data = job.recv().await;
info!("v6 data: {:?}", data);
});

9
g3proxy/src/escape/direct_fixed/udp_relay/send.rs
View file

@ -49,7 +49,7 @@ pub(crate) struct DirectUdpRelayRemoteSend<T> {
resolver_handle: ArcIntegratedResolverHandle,
resolve_strategy: ResolveStrategy,
resolver_job: Option<ArriveFirstResolveJob>,
resolve_retry_domain: Option<String>,
resolve_retry_domain: Option<Arc<str>>,
resolved_port: u16,
resolved_ip: Option<IpAddr>,
}
@ -136,7 +136,7 @@ where
let resolver_job = ArriveFirstResolveJob::new(
&self.resolver_handle,
self.resolve_strategy,
Arc::from(domain),
domain,
)?;
self.resolver_job = Some(resolver_job);
// no retry by leaving resolve_retry_domain to None
@ -165,13 +165,14 @@ where
}
Host::Domain(domain) => {
self.resolved_port = to.port();
let domain: Arc<str> = Arc::from(domain.as_str());
let resolver_job = ArriveFirstResolveJob::new(
&self.resolver_handle,
self.resolve_strategy,
Arc::from(domain.as_str()),
domain.clone(),
)?;
self.resolver_job = Some(resolver_job);
self.resolve_retry_domain = Some(domain.to_string());
self.resolve_retry_domain = Some(domain);
self.poll_send_packet(cx, buf, to)
}
}

34
lib/g3-resolver/src/driver/hickory/client.rs
View file

@ -177,30 +177,40 @@ impl HickoryClientJob {
let mut ttl = 0;
for r in msg.take_answers() {
ttl = r.ttl();
match r.data() {
Some(RData::A(v)) => {
let Some(rdata) = r.data() else {
continue;
};
match rdata {
RData::A(v) => {
if req.rtype == RecordType::A {
ips.push(IpAddr::V4(v.0));
}
}
Some(RData::AAAA(v)) => {
RData::AAAA(v) => {
if req.rtype == RecordType::AAAA {
ips.push(IpAddr::V6(v.0))
}
}
Some(RData::CNAME(v)) => {
has_cname = true;
name = v.0.clone();
RData::CNAME(v) => {
if name.eq(r.name()) {
has_cname = true;
name = v.0.clone();
}
}
_ => {}
}
}
if has_cname {
self.try_truncated = true;
continue;
}
let ttl = ttl.clamp(self.config.positive_min_ttl, self.config.positive_max_ttl);
return ResolvedRecord::resolved(req.domain, ttl, ips);
return if ips.is_empty() {
if has_cname {
self.try_truncated = true;
continue;
}
ResolvedRecord::resolved(req.domain, self.config.negative_ttl, ips)
} else {
let ttl =
ttl.clamp(self.config.positive_min_ttl, self.config.positive_max_ttl);
ResolvedRecord::resolved(req.domain, ttl, ips)
};
}
Err(e) => {
self.state.add_failed();