Merge "DoH statistics is now available from DnsStats and is shown in dumpsys dnsresolver."

1 files changed, 10 insertions, 0 deletions

diff --git a/PrivateDnsConfiguration.cpp b/PrivateDnsConfiguration.cpp
index 491acded..df60cc32 100644
--- a/PrivateDnsConfiguration.cpp
+++ b/PrivateDnsConfiguration.cpp
@@ -386,6 +386,16 @@ void PrivateDnsConfiguration::setObserver(PrivateDnsValidationObserver* observer
     mObserver = observer;
 }
 
+base::Result<netdutils::IPSockAddr> PrivateDnsConfiguration::getDohServer(unsigned netId) const {
+    std::lock_guard guard(mPrivateDnsLock);
+    auto it = mDohTracker.find(netId);
+    if (it != mDohTracker.end()) {
+        return netdutils::IPSockAddr::toIPSockAddr(it->second.ipAddr, 443);
+    }
+
+    return Errorf("Failed to get DoH Server: netId {} not found", netId);
+}
+
 void PrivateDnsConfiguration::notifyValidationStateUpdate(const netdutils::IPSockAddr& sockaddr,
                                                           Validation validation,
                                                           uint32_t netId) const {