starred/shadowsocks-rust
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-rust.git synced 2026-11-06 16:14:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preserve errors in acl_lookup

Browse Source
This commit is contained in:
Mygod
2020-05-09 09:40:50 +08:00
parent f8087d2218
commit cd462d0a65
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/relay/dnsrelay/mod.rs
+13 -12
View File
@@ -35,7 +35,7 @@ async fn acl_lookup<Local, Remote>(
local: Arc<Local>,
remote: Arc<Remote>,
query: &Query
) -> io::Result<(Message, bool)>
) -> (io::Result<Message>, bool)
where
Local: upstream::Upstream,
Remote: upstream::Upstream,
@@ -52,20 +52,21 @@ async fn acl_lookup<Local, Remote>(
match qname_in_proxy_list {
Some(true) => {
let remote_response = remote_response_fut.await.unwrap_or_else(|_| Message::new());
let remote_response = remote_response_fut.await;
debug!("pick remote response (qname): {:?}", remote_response);
return Ok((remote_response, true));
return (remote_response, true);
}
Some(false) => {
let local_response = local_response_fut.await.unwrap_or_else(|_| Message::new());
let local_response = local_response_fut.await;
debug!("pick local response (qname): {:?}", local_response);
return Ok((local_response, false));
return (local_response, false);
}
None => (),
}
let local_response = local_response_fut.await.unwrap_or_else(|_| Message::new());
for rec in local_response.answers() {
// FIXME: spawn(remote_response_fut)
let local_response = local_response_fut.await;
for rec in local_response.unwrap_or_else(|_| Message::new()).answers() {
if rec.record_type() != query.query_type() {
warn!("local DNS response has inconsistent answer type {} for query {}", rec.record_type(), query);
break
@@ -78,13 +79,13 @@ async fn acl_lookup<Local, Remote>(
};
if !forward {
debug!("pick local response (response): {:?}", local_response);
return Ok((local_response, false));
return (local_response, false);
}
}
let remote_response = remote_response_fut.await.unwrap_or_else(|_| Message::new());
let remote_response = remote_response_fut.await;
debug!("pick remote response (response): {:?}", remote_response);
Ok((remote_response, true))
(remote_response, true)
}
/// Start a DNS relay local server
@@ -174,9 +175,9 @@ pub async fn run(context: SharedContext) -> io::Result<()> {
message.set_response_code(ResponseCode::FormErr);
} else {
let question = &request.queries()[0];
let r = acl_lookup(context.clone(), local_upstream, remote_upstream, question).await;
let (r, forward) = acl_lookup(context.clone(), local_upstream, remote_upstream, question).await;
if let Ok((result, forward)) = r {
if let Ok(result) = r {
for rec in result.answers() {
debug!("dns answer: {:?}", rec);