diff options
| -rw-r--r-- | packet/src/buffer.rs | 12 | ||||
| -rw-r--r-- | packet/src/header.rs | 6 | ||||
| -rw-r--r-- | packet/src/lib.rs | 9 | ||||
| -rw-r--r-- | packet/src/query.rs | 26 | ||||
| -rw-r--r-- | packet/src/question.rs | 4 | ||||
| -rw-r--r-- | packet/src/record.rs | 38 | ||||
| -rw-r--r-- | packet/src/result.rs | 14 | ||||
| -rw-r--r-- | resolver/Cargo.lock | 357 | ||||
| -rw-r--r-- | resolver/src/config.rs | 4 | ||||
| -rw-r--r-- | resolver/src/lib.rs | 2 | ||||
| -rw-r--r-- | resolver/src/server.rs | 14 |
11 files changed, 421 insertions, 65 deletions
diff --git a/packet/src/buffer.rs b/packet/src/buffer.rs index 3809781..4394705 100644 --- a/packet/src/buffer.rs +++ b/packet/src/buffer.rs @@ -6,8 +6,8 @@ pub struct PacketBuffer { } impl PacketBuffer { - pub fn new() -> PacketBuffer { - PacketBuffer { + pub fn new() -> Self { + Self { buf: [0; 512], pos: 0, } @@ -50,7 +50,7 @@ impl PacketBuffer { if start + len >= 512 { return Err("End of buffer".into()); } - Ok(&self.buf[start..start + len as usize]) + Ok(&self.buf[start..start + len]) } pub fn read_u16(&mut self) -> Result<u16> { @@ -63,7 +63,7 @@ impl PacketBuffer { let res = ((self.read()? as u32) << 24) | ((self.read()? as u32) << 16) | ((self.read()? as u32) << 8) - | ((self.read()? as u32) << 0); + | (self.read()? as u32); Ok(res) } @@ -80,7 +80,7 @@ impl PacketBuffer { // can craft a packet with a cycle in the jump instructions. This guards // against such packets. if jumps_performed > max_jumps { - return Err(format!("Limit of {} jumps exceeded", max_jumps).into()); + return Err(format!("Limit of {max_jumps} jumps exceeded").into()); } let len = self.get(pos)?; @@ -154,7 +154,7 @@ impl PacketBuffer { self.write(((val >> 24) & 0xFF) as u8)?; self.write(((val >> 16) & 0xFF) as u8)?; self.write(((val >> 8) & 0xFF) as u8)?; - self.write(((val >> 0) & 0xFF) as u8)?; + self.write((val & 0xFF) as u8)?; Ok(()) } diff --git a/packet/src/header.rs b/packet/src/header.rs index c636619..b2bf1a1 100644 --- a/packet/src/header.rs +++ b/packet/src/header.rs @@ -23,8 +23,8 @@ pub struct DnsHeader { } impl DnsHeader { - pub fn new() -> DnsHeader { - DnsHeader { + pub fn new() -> Self { + Self { id: 0, recursion_desired: false, @@ -81,7 +81,7 @@ impl DnsHeader { | ((self.truncated_message as u8) << 1) | ((self.authoritative_answer as u8) << 2) | (self.opcode << 3) - | ((self.response as u8) << 7) as u8, + | ((self.response as u8) << 7), )?; buffer.write_u8( diff --git a/packet/src/lib.rs b/packet/src/lib.rs index 6c9a097..c7a8eb9 100644 --- a/packet/src/lib.rs +++ b/packet/src/lib.rs @@ -28,8 +28,8 @@ pub use query::QueryType as PacketType; pub use question::DnsQuestion as PacketQuestion; impl Packet { - pub fn new() -> Packet { - Packet { + pub fn new() -> Self { + Self { header: DnsHeader::new(), questions: Vec::new(), answers: Vec::new(), @@ -38,8 +38,8 @@ impl Packet { } } - pub fn from_buffer(buffer: &mut PacketBuffer) -> Result<Packet> { - let mut result = Packet::new(); + pub fn from_buffer(buffer: &mut PacketBuffer) -> Result<Self> { + let mut result = Self::new(); result.header.read(buffer)?; for _ in 0..result.header.questions { @@ -138,7 +138,6 @@ impl Packet { _ => None, }) }) - .map(|addr| addr) // Finally, pick the first valid entry .next() } diff --git a/packet/src/query.rs b/packet/src/query.rs index ac993bd..8804d15 100644 --- a/packet/src/query.rs +++ b/packet/src/query.rs @@ -11,23 +11,23 @@ pub enum QueryType { impl QueryType { pub fn to_num(&self) -> u16 { match *self { - QueryType::UNKNOWN(x) => x, - QueryType::A => 1, - QueryType::NS => 2, - QueryType::CNAME => 5, - QueryType::MX => 15, - QueryType::AAAA => 28, + Self::UNKNOWN(x) => x, + Self::A => 1, + Self::NS => 2, + Self::CNAME => 5, + Self::MX => 15, + Self::AAAA => 28, } } - pub fn from_num(num: u16) -> QueryType { + pub fn from_num(num: u16) -> Self { match num { - 1 => QueryType::A, - 2 => QueryType::NS, - 5 => QueryType::CNAME, - 15 => QueryType::MX, - 28 => QueryType::AAAA, - _ => QueryType::UNKNOWN(num), + 1 => Self::A, + 2 => Self::NS, + 5 => Self::CNAME, + 15 => Self::MX, + 28 => Self::AAAA, + _ => Self::UNKNOWN(num), } } }
\ No newline at end of file diff --git a/packet/src/question.rs b/packet/src/question.rs index ccb5c92..076de00 100644 --- a/packet/src/question.rs +++ b/packet/src/question.rs @@ -7,8 +7,8 @@ pub struct DnsQuestion { } impl DnsQuestion { - pub fn new(name: String, qtype: QueryType) -> DnsQuestion { - DnsQuestion { name, qtype } + pub fn new(name: String, qtype: QueryType) -> Self { + Self { name, qtype } } pub fn read(&mut self, buffer: &mut PacketBuffer) -> Result<()> { diff --git a/packet/src/record.rs b/packet/src/record.rs index bc9b694..c7ff1ac 100644 --- a/packet/src/record.rs +++ b/packet/src/record.rs @@ -40,7 +40,7 @@ pub enum DnsRecord { } impl DnsRecord { - pub fn read(buffer: &mut PacketBuffer) -> Result<DnsRecord> { + pub fn read(buffer: &mut PacketBuffer) -> Result<Self> { let mut domain = String::new(); buffer.read_qname(&mut domain)?; @@ -57,10 +57,10 @@ impl DnsRecord { ((raw_addr >> 24) & 0xFF) as u8, ((raw_addr >> 16) & 0xFF) as u8, ((raw_addr >> 8) & 0xFF) as u8, - ((raw_addr >> 0) & 0xFF) as u8, + (raw_addr & 0xFF) as u8, ); - Ok(DnsRecord::A { domain, addr, ttl }) + Ok(Self::A { domain, addr, ttl }) } QueryType::AAAA => { let raw_addr1 = buffer.read_u32()?; @@ -69,22 +69,22 @@ impl DnsRecord { let raw_addr4 = buffer.read_u32()?; let addr = Ipv6Addr::new( ((raw_addr1 >> 16) & 0xFFFF) as u16, - ((raw_addr1 >> 0) & 0xFFFF) as u16, + (raw_addr1 & 0xFFFF) as u16, ((raw_addr2 >> 16) & 0xFFFF) as u16, - ((raw_addr2 >> 0) & 0xFFFF) as u16, + (raw_addr2 & 0xFFFF) as u16, ((raw_addr3 >> 16) & 0xFFFF) as u16, - ((raw_addr3 >> 0) & 0xFFFF) as u16, + (raw_addr3 & 0xFFFF) as u16, ((raw_addr4 >> 16) & 0xFFFF) as u16, - ((raw_addr4 >> 0) & 0xFFFF) as u16, + (raw_addr4 & 0xFFFF) as u16, ); - Ok(DnsRecord::AAAA { domain, addr, ttl }) + Ok(Self::AAAA { domain, addr, ttl }) } QueryType::NS => { let mut ns = String::new(); buffer.read_qname(&mut ns)?; - Ok(DnsRecord::NS { + Ok(Self::NS { domain, host: ns, ttl, @@ -94,7 +94,7 @@ impl DnsRecord { let mut cname = String::new(); buffer.read_qname(&mut cname)?; - Ok(DnsRecord::CNAME { + Ok(Self::CNAME { domain, host: cname, ttl, @@ -105,7 +105,7 @@ impl DnsRecord { let mut mx = String::new(); buffer.read_qname(&mut mx)?; - Ok(DnsRecord::MX { + Ok(Self::MX { domain, priority, host: mx, @@ -115,7 +115,7 @@ impl DnsRecord { QueryType::UNKNOWN(_) => { buffer.step(data_len as usize)?; - Ok(DnsRecord::UNKNOWN { + Ok(Self::UNKNOWN { domain, qtype: qtype_num, data_len, @@ -129,7 +129,7 @@ impl DnsRecord { let start_pos = buffer.pos(); match *self { - DnsRecord::A { + Self::A { ref domain, ref addr, ttl, @@ -146,7 +146,7 @@ impl DnsRecord { buffer.write_u8(octets[2])?; buffer.write_u8(octets[3])?; } - DnsRecord::NS { + Self::NS { ref domain, ref host, ttl, @@ -164,7 +164,7 @@ impl DnsRecord { let size = buffer.pos() - (pos + 2); buffer.set_u16(pos, size as u16)?; } - DnsRecord::CNAME { + Self::CNAME { ref domain, ref host, ttl, @@ -182,7 +182,7 @@ impl DnsRecord { let size = buffer.pos() - (pos + 2); buffer.set_u16(pos, size as u16)?; } - DnsRecord::MX { + Self::MX { ref domain, priority, ref host, @@ -202,7 +202,7 @@ impl DnsRecord { let size = buffer.pos() - (pos + 2); buffer.set_u16(pos, size as u16)?; } - DnsRecord::AAAA { + Self::AAAA { ref domain, ref addr, ttl, @@ -217,8 +217,8 @@ impl DnsRecord { buffer.write_u16(*octet)?; } } - DnsRecord::UNKNOWN { .. } => { - println!("Skipping record: {:?}", self); + Self::UNKNOWN { .. } => { + println!("Skipping record: {self:?}"); } } diff --git a/packet/src/result.rs b/packet/src/result.rs index 66108b8..f33bd7d 100644 --- a/packet/src/result.rs +++ b/packet/src/result.rs @@ -9,14 +9,14 @@ pub enum ResultCode { } impl ResultCode { - pub fn from_num(num: u8) -> ResultCode { + pub fn from_num(num: u8) -> Self { match num { - 1 => ResultCode::FORMERR, - 2 => ResultCode::SERVFAIL, - 3 => ResultCode::NXDOMAIN, - 4 => ResultCode::NOTIMP, - 5 => ResultCode::REFUSED, - 0 | _ => ResultCode::NOERROR, + 1 => Self::FORMERR, + 2 => Self::SERVFAIL, + 3 => Self::NXDOMAIN, + 4 => Self::NOTIMP, + 5 => Self::REFUSED, + 0 | _ => Self::NOERROR, } } }
\ No newline at end of file diff --git a/resolver/Cargo.lock b/resolver/Cargo.lock new file mode 100644 index 0000000..66ac595 --- /dev/null +++ b/resolver/Cargo.lock @@ -0,0 +1,357 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "async-recursion" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b015a331cc64ebd1774ba119538573603427eaace0a1950c423ab971f903796" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bytes" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "mio" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.45.0", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "packet" +version = "0.1.0" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys 0.45.0", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "proc-macro2" +version = "1.0.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "resolver" +version = "0.1.0" +dependencies = [ + "async-recursion", + "packet", + "tokio", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "socket2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tokio" +version = "1.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" +dependencies = [ + "autocfg", + "bytes", + "libc", + "memchr", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.42.0", +] + +[[package]] +name = "tokio-macros" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" diff --git a/resolver/src/config.rs b/resolver/src/config.rs index 762f311..ef7d5a8 100644 --- a/resolver/src/config.rs +++ b/resolver/src/config.rs @@ -13,11 +13,11 @@ impl Config { } pub fn get_fallback_ns(&self) -> &IpAddr { - return &self.fallback; + &self.fallback } pub fn set_fallback_ns(&mut self, addr: &IpAddr) { - self.fallback = addr.clone(); + self.fallback = *addr; } }
\ No newline at end of file diff --git a/resolver/src/lib.rs b/resolver/src/lib.rs index d66ad5e..98df317 100644 --- a/resolver/src/lib.rs +++ b/resolver/src/lib.rs @@ -25,7 +25,7 @@ impl DnsResolver { loop { match handle_query(&socket, &self.config).await { Ok(_) => {} - Err(e) => eprintln!("An error occurred: {}", e), + Err(e) => eprintln!("An error occurred: {e}"), } } } diff --git a/resolver/src/server.rs b/resolver/src/server.rs index b9c5fee..764b7a2 100644 --- a/resolver/src/server.rs +++ b/resolver/src/server.rs @@ -31,10 +31,10 @@ async fn lookup(qname: &str, qtype: PacketType, server: (IpAddr, u16)) -> Result #[async_recursion] async fn recursive_lookup(qname: &str, qtype: PacketType, config: &Config) -> Result<Packet> { - let mut ns = config.get_fallback_ns().clone(); + let mut ns = *config.get_fallback_ns(); loop { - println!("attempting lookup of {:?} {} with ns {}", qtype, qname, ns); + println!("attempting lookup of {qtype:?} {qname} with ns {ns}"); let ns_copy = ns; @@ -60,7 +60,7 @@ async fn recursive_lookup(qname: &str, qtype: PacketType, config: &Config) -> Re None => return Ok(response), }; - let recursive_response = recursive_lookup(&new_ns_name, PacketType::A, config).await?; + let recursive_response = recursive_lookup(new_ns_name, PacketType::A, config).await?; if let Some(new_ns) = recursive_response.get_random_a() { ns = new_ns; @@ -84,22 +84,22 @@ pub async fn handle_query(socket: &UdpSocket, config: &Config) -> Result<()> { packet.header.response = true; if let Some(question) = request.questions.pop() { - println!("Received query: {:?}", question); + println!("Received query: {question:?}"); if let Ok(result) = recursive_lookup(&question.name, question.qtype, config).await { packet.questions.push(question.clone()); packet.header.rescode = result.header.rescode; for rec in result.answers { - println!("Answer: {:?}", rec); + println!("Answer: {rec:?}"); packet.answers.push(rec); } for rec in result.authorities { - println!("Authority: {:?}", rec); + println!("Authority: {rec:?}"); packet.authorities.push(rec); } for rec in result.resources { - println!("Resource: {:?}", rec); + println!("Resource: {rec:?}"); packet.resources.push(rec); } } else { |