nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-22 06:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3063 from aurelj/dns_qtype_either

Browse Source 
dns: properly handle AddrType::Either in get_host_by_name()
This commit is contained in:
Dario Nieuwenhuis 2024-06-11 18:53:14 +00:00 committed by GitHub
commit 5154de3b7e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
embassy-net/src/dns.rs
View File

@ -84,11 +84,26 @@ where
addr_type: embedded_nal_async::AddrType,
) -> Result<embedded_nal_async::IpAddr, Self::Error> {
use embedded_nal_async::{AddrType, IpAddr};
let qtype = match addr_type {
AddrType::IPv6 => DnsQueryType::Aaaa,
_ => DnsQueryType::A,
let (qtype, secondary_qtype) = match addr_type {
AddrType::IPv4 => (DnsQueryType::A, None),
AddrType::IPv6 => (DnsQueryType::Aaaa, None),
AddrType::Either => {
#[cfg(not(feature = "proto-ipv6"))]
let v6_first = false;
#[cfg(feature = "proto-ipv6")]
let v6_first = self.stack.config_v6().is_some();
match v6_first {
true => (DnsQueryType::Aaaa, Some(DnsQueryType::A)),
false => (DnsQueryType::A, Some(DnsQueryType::Aaaa)),
}
}
};
let addrs = self.query(host, qtype).await?;
let mut addrs = self.query(host, qtype).await?;
if addrs.is_empty() {
if let Some(qtype) = secondary_qtype {
addrs = self.query(host, qtype).await?
}
}
if let Some(first) = addrs.get(0) {
Ok(match first {
#[cfg(feature = "proto-ipv4")]