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/DnsProxyListener.cpp b/DnsProxyListener.cpp
index 9743acd..dc8cd96 100644
--- a/DnsProxyListener.cpp
+++ b/DnsProxyListener.cpp
@@ -118,18 +118,11 @@
return (flags & NET_CONTEXT_FLAG_USE_LOCAL_NAMESERVERS) != 0;
}
-inline bool queryingViaTls(unsigned dns_netid) {
- // TODO: The simpler PrivateDnsStatus should suffice here.
- ExternalPrivateDnsStatus privateDnsStatus = {PrivateDnsMode::OFF, 0, {}};
- gPrivateDnsConfiguration.getStatus(dns_netid, &privateDnsStatus);
- switch (static_cast<PrivateDnsMode>(privateDnsStatus.mode)) {
+bool queryingViaTls(unsigned dns_netid) {
+ const auto privateDnsStatus = gPrivateDnsConfiguration.getStatus(dns_netid);
+ switch (privateDnsStatus.mode) {
case PrivateDnsMode::OPPORTUNISTIC:
- for (int i = 0; i < privateDnsStatus.numServers; i++) {
- if (privateDnsStatus.serverStatus[i].validation == Validation::success) {
- return true;
- }
- }
- return false;
+ return !privateDnsStatus.validatedServers().empty();
case PrivateDnsMode::STRICT:
return true;
default:
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;
diff --git a/PrivateDnsConfiguration.h b/PrivateDnsConfiguration.h
index d52db77..5800831 100644
--- a/PrivateDnsConfiguration.h
+++ b/PrivateDnsConfiguration.h
@@ -14,8 +14,7 @@
* limitations under the License.
*/
-#ifndef NETD_RESOLV_PRIVATEDNSCONFIGURATION_H
-#define NETD_RESOLV_PRIVATEDNSCONFIGURATION_H
+#pragma once
#include <list>
#include <map>
@@ -37,31 +36,28 @@
struct PrivateDnsStatus {
PrivateDnsMode mode;
- std::list<DnsTlsServer> validatedServers;
-};
+ std::map<DnsTlsServer, Validation, AddressComparator> serversMap;
-// TODO: remove this C-style struct and use PrivateDnsStatus everywhere.
-struct ExternalPrivateDnsStatus {
- PrivateDnsMode mode;
- int numServers;
- struct PrivateDnsInfo {
- sockaddr_storage ss;
- const char* hostname;
- Validation validation;
- } serverStatus[MAXNS];
+ std::list<DnsTlsServer> validatedServers() const {
+ std::list<DnsTlsServer> servers;
+
+ for (const auto& pair : serversMap) {
+ if (pair.second == Validation::success) {
+ servers.push_back(pair.first);
+ }
+ }
+ return servers;
+ }
};
class PrivateDnsConfiguration {
public:
int set(int32_t netId, uint32_t mark, const std::vector<std::string>& servers,
- const std::string& name, const std::string& caCert);
+ const std::string& name, const std::string& caCert) EXCLUDES(mPrivateDnsLock);
- PrivateDnsStatus getStatus(unsigned netId);
+ PrivateDnsStatus getStatus(unsigned netId) EXCLUDES(mPrivateDnsLock);
- // DEPRECATED, use getStatus() above.
- void getStatus(unsigned netId, ExternalPrivateDnsStatus* status);
-
- void clear(unsigned netId);
+ void clear(unsigned netId) EXCLUDES(mPrivateDnsLock);
private:
typedef std::map<DnsTlsServer, Validation, AddressComparator> PrivateDnsTracker;
@@ -88,5 +84,3 @@
} // namespace net
} // namespace android
-
-#endif /* NETD_RESOLV_PRIVATEDNSCONFIGURATION_H */
diff --git a/ResolverController.cpp b/ResolverController.cpp
index 0128a12..a53d05a 100644
--- a/ResolverController.cpp
+++ b/ResolverController.cpp
@@ -249,11 +249,9 @@
// 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 @@
}
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();
}
diff --git a/res_send.cpp b/res_send.cpp
index 85e8a58..f86e5f6 100644
--- a/res_send.cpp
+++ b/res_send.cpp
@@ -1223,7 +1223,7 @@
return -1;
}
- if (privateDnsStatus.validatedServers.empty()) {
+ if (privateDnsStatus.validatedServers().empty()) {
if (privateDnsStatus.mode == PrivateDnsMode::OPPORTUNISTIC) {
*fallback = true;
return -1;
@@ -1242,12 +1242,14 @@
// network change.
for (int i = 0; i < 42; i++) {
std::this_thread::sleep_for(std::chrono::milliseconds(100));
- if (!gPrivateDnsConfiguration.getStatus(netId).validatedServers.empty()) {
+ // Calling getStatus() to merely check if there's any validated server seems
+ // wasteful. Consider adding a new method in PrivateDnsConfiguration for speed ups.
+ if (!gPrivateDnsConfiguration.getStatus(netId).validatedServers().empty()) {
privateDnsStatus = gPrivateDnsConfiguration.getStatus(netId);
break;
}
}
- if (privateDnsStatus.validatedServers.empty()) {
+ if (privateDnsStatus.validatedServers().empty()) {
return -1;
}
}
@@ -1255,7 +1257,7 @@
LOG(INFO) << __func__ << ": performing query over TLS";
- const auto response = sDnsTlsDispatcher.query(privateDnsStatus.validatedServers, statp, query,
+ const auto response = sDnsTlsDispatcher.query(privateDnsStatus.validatedServers(), statp, query,
answer, &resplen);
LOG(INFO) << __func__ << ": TLS query result: " << static_cast<int>(response);
