Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ rand = { version = "0.10.1" }
md-5 = "0.11.0"
sha2 = "0.11.0"
if-addrs = "0.14"
hickory-resolver = { version = "0.25.2", features = [
hickory-resolver = { version = "0.26.1", features = [
"system-config",
"tokio",
], optional = true }
Expand Down
28 changes: 16 additions & 12 deletions src/resolver/sip_resolver.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use crate::sip::{Domain, Port, Transport};
use hickory_resolver::proto::rr::RData;
use hickory_resolver::TokioResolver;
use rand::RngExt;
use std::net::IpAddr;
Expand Down Expand Up @@ -26,8 +27,9 @@ impl Default for SipResolver {
impl SipResolver {
pub fn new() -> Self {
let resolver = TokioResolver::builder_tokio()
.expect("Unexpected error creating DNS resolver")
.build();
.expect("Error reading system config to build DNS resolver")
.build()
.expect("Error building DNS resolver");
Self {
resolver: Arc::new(resolver),
}
Expand Down Expand Up @@ -68,16 +70,18 @@ impl LookupSource for HickorySource {
match self.0.srv_lookup(name).await {
Ok(records) => {
let mut res = Vec::new();
for r in records {
let target = r.target().to_string();
// Remove trailing dot
let target = target.trim_end_matches('.').to_string();
res.push(SrvRecord {
target,
port: r.port(),
priority: r.priority(),
weight: r.weight(),
});
for r in records.message().all_sections() {
if let RData::SRV(srv) = &r.data {
let target = srv.target.to_string();
// Remove trailing dot
let target = target.trim_end_matches('.').to_string();
res.push(SrvRecord {
target,
port: srv.port,
priority: srv.priority,
weight: srv.weight,
});
}
}
Ok(res)
}
Expand Down