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

Refine code style

Browse Source
This commit is contained in:
Mygod
2020-05-10 06:59:39 +08:00
parent 49966d9590
commit 10e8041dee
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/relay/dnsrelay/mod.rs
+6 -7
View File
@@ -105,9 +105,9 @@ fn should_forward_by_response(
return true;
}
let forward = match $rec.rdata() {
RData::A(ref ip) => acl.check_ip_in_proxy_list(&IpAddr::from(*ip)),
RData::AAAA(ref ip) => acl.check_ip_in_proxy_list(&IpAddr::from(*ip)),
RData::PTR(_) => panic!("PTR records should not reach here"),
RData::A(ref ip) => acl.check_ip_in_proxy_list(&IpAddr::V4(*ip)),
RData::AAAA(ref ip) => acl.check_ip_in_proxy_list(&IpAddr::V6(*ip)),
RData::PTR(_) => unreachable!(),
_ => acl.is_default_in_proxy_list(),
};
if !forward {
@@ -170,8 +170,7 @@ async fn acl_lookup<Local, Remote>(
Some(local_response)
}
};
tokio::pin!(remote_response_fut);
tokio::pin!(decider);
tokio::pin!(remote_response_fut, decider);
let mut use_remote = false;
let mut remote_response = None;
loop {
@@ -294,8 +293,8 @@ pub async fn run(context: SharedContext) -> io::Result<()> {
debug!("dns answer: {:?}", rec);
match rec.rdata() {
RData::A(ref ip) => context.add_to_reverse_lookup_cache(&IpAddr::from(*ip), forward),
RData::AAAA(ref ip) => context.add_to_reverse_lookup_cache(&IpAddr::from(*ip), forward),
RData::A(ref ip) => context.add_to_reverse_lookup_cache(&IpAddr::V4(*ip), forward),
RData::AAAA(ref ip) => context.add_to_reverse_lookup_cache(&IpAddr::V6(*ip), forward),
_ => (),
}
}