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
diff --git a/PrivateDnsConfiguration.cpp b/PrivateDnsConfiguration.cpp
index c91367f..14bac16 100644
--- a/PrivateDnsConfiguration.cpp
+++ b/PrivateDnsConfiguration.cpp
@@ -126,37 +126,13 @@
const auto netPair = mPrivateDnsTransports.find(netId);
if (netPair != mPrivateDnsTransports.end()) {
for (const auto& serverPair : netPair->second) {
- if (serverPair.second == Validation::success) {
- status.validatedServers.push_back(serverPair.first);
- }
+ status.serversMap.emplace(serverPair.first, serverPair.second);
}
}
return status;
}
-void PrivateDnsConfiguration::getStatus(unsigned netId, ExternalPrivateDnsStatus* status) {
- std::lock_guard guard(mPrivateDnsLock);
-
- const auto mode = mPrivateDnsModes.find(netId);
- if (mode == mPrivateDnsModes.end()) return;
- status->mode = mode->second;
-
- const auto netPair = mPrivateDnsTransports.find(netId);
- if (netPair != mPrivateDnsTransports.end()) {
- int count = 0;
- for (const auto& serverPair : netPair->second) {
- status->serverStatus[count].ss = serverPair.first.ss;
- status->serverStatus[count].hostname =
- serverPair.first.name.empty() ? "" : serverPair.first.name.c_str();
- status->serverStatus[count].validation = serverPair.second;
- count++;
- if (count >= MAXNS) break; // Lose the rest
- }
- status->numServers = count;
- }
-}
-
void PrivateDnsConfiguration::clear(unsigned netId) {
LOG(DEBUG) << "PrivateDnsConfiguration::clear(" << netId << ")";
std::lock_guard guard(mPrivateDnsLock);
@@ -242,6 +218,9 @@
auto& tracker = netPair->second;
auto serverPair = tracker.find(server);
if (serverPair == tracker.end()) {
+ // TODO: Consider not adding this server to the tracker since this server is not expected
+ // to be one of the private DNS servers for this network now. This could prevent this
+ // server from being included when dumping status.
LOG(WARNING) << "Server " << addrToString(&server.ss)
<< " was removed during private DNS validation";
success = false;