Skip to content

Commit 02fa09e

Browse files
committed
dnswait should print port numbers too
1 parent ee88853 commit 02fa09e

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

internal-dns-cli/src/bin/dnswait.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ async fn main() -> Result<()> {
9090
.await
9191
.context("unexpectedly gave up")?;
9292

93-
for ip in result {
94-
println!("{}", ip)
93+
for (target, port) in result {
94+
println!("{}:{}", target, port)
9595
}
9696

9797
Ok(())

internal-dns/src/resolver.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ impl Resolver {
137137
pub async fn lookup_srv(
138138
&self,
139139
srv: crate::ServiceName,
140-
) -> Result<Vec<String>, ResolveError> {
140+
) -> Result<Vec<(String, u16)>, ResolveError> {
141141
let name = format!("{}.{}", srv.dns_name(), DNS_ZONE);
142142
trace!(self.log, "lookup_srv"; "dns_name" => &name);
143143
let response = self.inner.srv_lookup(&name).await?;
@@ -148,7 +148,10 @@ impl Resolver {
148148
"response" => ?response
149149
);
150150

151-
Ok(response.into_iter().map(|srv| srv.target().to_string()).collect())
151+
Ok(response
152+
.into_iter()
153+
.map(|srv| (srv.target().to_string(), srv.port()))
154+
.collect())
152155
}
153156

154157
pub async fn lookup_all_ipv6(

0 commit comments

Comments
 (0)