xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tokio-xmpp: Add debug for chosen DNS method

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2023-06-18 16:46:49 +02:00
commit 99f3811c71
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tokio-xmpp/src/happy_eyeballs.rs
View file

@ -1,5 +1,6 @@
use crate::{ConnecterError, Error}; use crate::{ConnecterError, Error};
use idna; use idna;
use log::debug;
use std::net::SocketAddr; use std::net::SocketAddr;
use tokio::net::TcpStream; use tokio::net::TcpStream;
use trust_dns_resolver::{IntoName, TokioAsyncResolver}; use trust_dns_resolver::{IntoName, TokioAsyncResolver};
@ -34,6 +35,7 @@ pub async fn connect_with_srv(
let ascii_domain = idna::domain_to_ascii(&domain).map_err(|_| Error::Idna)?; let ascii_domain = idna::domain_to_ascii(&domain).map_err(|_| Error::Idna)?;
if let Ok(ip) = ascii_domain.parse() { if let Ok(ip) = ascii_domain.parse() {
debug!("Attempting connection to {ip}:{fallback_port}");
return Ok(TcpStream::connect(&SocketAddr::new(ip, fallback_port)).await?); return Ok(TcpStream::connect(&SocketAddr::new(ip, fallback_port)).await?);
} }
@ -42,12 +44,13 @@ pub async fn connect_with_srv(
let srv_domain = format!("{}.{}.", srv, ascii_domain) let srv_domain = format!("{}.{}.", srv, ascii_domain)
.into_name() .into_name()
.map_err(ConnecterError::Dns)?; .map_err(ConnecterError::Dns)?;
let srv_records = resolver.srv_lookup(srv_domain).await.ok(); let srv_records = resolver.srv_lookup(srv_domain.clone()).await.ok();
match srv_records { match srv_records {
Some(lookup) => { Some(lookup) => {
// TODO: sort lookup records by priority/weight // TODO: sort lookup records by priority/weight
for srv in lookup.iter() { for srv in lookup.iter() {
debug!("Attempting connection to {srv_domain} {srv}");
match connect_to_host(&srv.target().to_ascii(), srv.port()).await { match connect_to_host(&srv.target().to_ascii(), srv.port()).await {
Ok(stream) => return Ok(stream), Ok(stream) => return Ok(stream),
Err(_) => {} Err(_) => {}
@ -57,6 +60,7 @@ pub async fn connect_with_srv(
} }
None => { None => {
// SRV lookup error, retry with hostname // SRV lookup error, retry with hostname
debug!("Attempting connection to {domain}:{fallback_port}");
connect_to_host(domain, fallback_port).await connect_to_host(domain, fallback_port).await
} }
} }