diff --git a/Cargo.toml b/Cargo.toml index 81a9b74..43b2b85 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,22 +11,22 @@ crate-type = ["cdylib", "lib"] base64 = { version = "0.21" } clap = { version = "4.3", features = ["derive"] } ctrlc = "3.4" -digest_auth = "0.3.1" +digest_auth = "0.3" dotenvy = "0.15" env_logger = "0.10" fork = "0.1" hashlink = "0.8" -httparse = "1.8.0" +httparse = "1.8" libc = "0.2" log = "0.4" mio = { version = "0.8", features = ["os-poll", "net", "os-ext"] } nix = { version = "0.26", features = ["process", "signal"] } prctl = "1.0" -smoltcp = { version = "0.10.0", features = ["std", "phy-tuntap_interface"] } +smoltcp = { version = "0.10", features = ["std", "phy-tuntap_interface"] } socks5-impl = { version = "0.5", default-features = false } thiserror = "1.0" -trust-dns-proto = "0.22" -unicase = "2.6.0" +trust-dns-proto = "0.23" +unicase = "2.7" url = "2.4" [target.'cfg(target_os="android")'.dependencies] diff --git a/src/dns.rs b/src/dns.rs index 33be70c..be95646 100644 --- a/src/dns.rs +++ b/src/dns.rs @@ -37,12 +37,12 @@ pub fn build_dns_response(mut request: Message, domain: &str, ip: IpAddr, ttl: u let record = match ip { IpAddr::V4(ip) => { let mut record = Record::with(Name::from_str(domain)?, RecordType::A, ttl); - record.set_data(Some(RData::A(ip))); + record.set_data(Some(RData::A(ip.into()))); record } IpAddr::V6(ip) => { let mut record = Record::with(Name::from_str(domain)?, RecordType::AAAA, ttl); - record.set_data(Some(RData::AAAA(ip))); + record.set_data(Some(RData::AAAA(ip.into()))); record } }; @@ -64,10 +64,10 @@ pub fn extract_ipaddr_from_dns_message(message: &Message) -> Result { - return Ok(IpAddr::V4(*addr)); + return Ok(IpAddr::V4((*addr).into())); } RData::AAAA(addr) => { - return Ok(IpAddr::V6(*addr)); + return Ok(IpAddr::V6((*addr).into())); } RData::CNAME(name) => { cname = Some(name.to_utf8()); diff --git a/src/tun2proxy.rs b/src/tun2proxy.rs index 8c5d014..a88bb0b 100644 --- a/src/tun2proxy.rs +++ b/src/tun2proxy.rs @@ -570,7 +570,7 @@ impl<'a> TunToProxy<'a> { let name = dns::extract_domain_from_dns_message(&message)?; let ip = dns::extract_ipaddr_from_dns_message(&message); - log::info!("DNS over TCP query result: {} -> {:?}", name, ip); + log::trace!("DNS over TCP query result: {} -> {:?}", name, ip); state .tcp_proxy_handler