Remove ExternalPrivateDnsStatus

ExternalPrivateDnsStatus was introduced for C-compatible version of
getStatus(), and now it's no more needed.

Bug: 130686826
Test: atest --include-subdirs packages/modules/DnsResolver
Test: dumpsys dnsresolver showed correct output
Change-Id: Iac50908f269d8921f1aadba8f2b50286a33325f7

1 files changed, 10 insertions, 15 deletions

diff --git a/ResolverController.cpp b/ResolverController.cpp
index 0128a121..a53d05a0 100644
--- a/ResolverController.cpp
+++ b/ResolverController.cpp
@@ -249,11 +249,9 @@ int ResolverController::getResolverInfo(int32_t netId, std::vector<std::string>*
     // Serialize the information for binder.
     ResolverStats::encodeAll(res_stats, stats);
 
-    ExternalPrivateDnsStatus privateDnsStatus = {PrivateDnsMode::OFF, 0, {}};
-    gPrivateDnsConfiguration.getStatus(netId, &privateDnsStatus);
-    for (int i = 0; i < privateDnsStatus.numServers; i++) {
-        std::string tlsServer_str = addrToString(&(privateDnsStatus.serverStatus[i].ss));
-        tlsServers->push_back(std::move(tlsServer_str));
+    const auto privateDnsStatus = gPrivateDnsConfiguration.getStatus(netId);
+    for (const auto& pair : privateDnsStatus.serversMap) {
+        tlsServers->push_back(addrToString(&pair.first.ss));
     }
 
     params->resize(IDnsResolver::RESOLVER_PARAMS_COUNT);
@@ -344,20 +342,17 @@ void ResolverController::dump(DumpWriter& dw, unsigned netId) {
         }
 
         mDns64Configuration.dump(dw, netId);
-        ExternalPrivateDnsStatus privateDnsStatus = {PrivateDnsMode::OFF, 0, {}};
-        gPrivateDnsConfiguration.getStatus(netId, &privateDnsStatus);
+        const auto privateDnsStatus = gPrivateDnsConfiguration.getStatus(netId);
         dw.println("Private DNS mode: %s", getPrivateDnsModeString(privateDnsStatus.mode));
-        if (!privateDnsStatus.numServers) {
+        if (privateDnsStatus.serversMap.size() == 0) {
             dw.println("No Private DNS servers configured");
         } else {
-            dw.println("Private DNS configuration (%u entries)", privateDnsStatus.numServers);
+            dw.println("Private DNS configuration (%u entries)",
+                       static_cast<uint32_t>(privateDnsStatus.serversMap.size()));
             dw.incIndent();
-            for (int i = 0; i < privateDnsStatus.numServers; i++) {
-                dw.println("%s name{%s} status{%s}",
-                           addrToString(&(privateDnsStatus.serverStatus[i].ss)).c_str(),
-                           privateDnsStatus.serverStatus[i].hostname,
-                           validationStatusToString(static_cast<Validation>(
-                                   privateDnsStatus.serverStatus[i].validation)));
+            for (const auto& pair : privateDnsStatus.serversMap) {
+                dw.println("%s name{%s} status{%s}", addrToString(&pair.first.ss).c_str(),
+                           pair.first.name.c_str(), validationStatusToString(pair.second));
             }
             dw.decIndent();
         }