fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-24 15:21:33 +00:00
Code Issues Projects Releases Wiki Activity

transports/dns: Remove fqdn function optimization (#2027)

Browse Source 
Co-authored-by: Max Inden <mail@max-inden.de>
This commit is contained in:
Pierre Krieger
2021-04-01 16:11:36 +02:00
committed by GitHub
parent a2e774992d
commit 2017c5c73a
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
transports/dns/src/lib.rs
View File

@ -45,7 +45,7 @@ use libp2p_core::{
transport::{TransportError, ListenerEvent}
};
use smallvec::SmallVec;
use std::{borrow::Cow, convert::TryFrom, error, fmt, iter, net::IpAddr, str};
use std::{convert::TryFrom, error, fmt, iter, net::IpAddr, str};
#[cfg(any(feature = "async-std", feature = "tokio"))]
use std::io;
#[cfg(any(feature = "async-std", feature = "tokio"))]
@ -384,7 +384,7 @@ where
{
match proto {
Protocol::Dns(ref name) => {
resolver.lookup_ip(fqdn(name)).map(move |res| match res {
resolver.lookup_ip(name.clone().into_owned()).map(move |res| match res {
Ok(ips) => {
let mut ips = ips.into_iter();
let one = ips.next()
@ -403,7 +403,7 @@ where
}).boxed()
}
Protocol::Dns4(ref name) => {
resolver.ipv4_lookup(fqdn(name)).map(move |res| match res {
resolver.ipv4_lookup(name.clone().into_owned()).map(move |res| match res {
Ok(ips) => {
let mut ips = ips.into_iter();
let one = ips.next()
@ -423,7 +423,7 @@ where
}).boxed()
}
Protocol::Dns6(ref name) => {
resolver.ipv6_lookup(fqdn(name)).map(move |res| match res {
resolver.ipv6_lookup(name.clone().into_owned()).map(move |res| match res {
Ok(ips) => {
let mut ips = ips.into_iter();
let one = ips.next()
@ -443,8 +443,8 @@ where
}).boxed()
},
Protocol::Dnsaddr(ref name) => {
let name = Cow::Owned([DNSADDR_PREFIX, name].concat());
resolver.txt_lookup(fqdn(&name)).map(move |res| match res {
let name = [DNSADDR_PREFIX, name].concat();
resolver.txt_lookup(name).map(move |res| match res {
Ok(txts) => {
let mut addrs = Vec::new();
for txt in txts {
@ -482,14 +482,6 @@ fn invalid_data(e: impl Into<Box<dyn std::error::Error + Send + Sync>>) -> io::E
io::Error::new(io::ErrorKind::InvalidData, e)
}
fn fqdn(name: &Cow<'_, str>) -> String {
if name.ends_with('.') {
name.to_string()
} else {
format!("{}.", name)
}
}
#[cfg(test)]
mod tests {
use super::*;