Harden TLS fingerprint test against flakiness
This change might reduce the flakiness of this test, and
also might help debug any future issues with it.
Bug: 64779303
Test: Tests continue to pass for me
Change-Id: I3a71b12f4ee3749c70210f1c19ca924473756fd5
diff --git a/server/ResolverController.cpp b/server/ResolverController.cpp
index 238eef7..823afbf 100644
--- a/server/ResolverController.cpp
+++ b/server/ResolverController.cpp
@@ -40,6 +40,7 @@
#include <resolv_stats.h>
#include <android-base/strings.h>
+#include <android-base/thread_annotations.h>
#include <android/net/INetd.h>
#include "DumpWriter.h"
@@ -97,13 +98,13 @@
// Structure for tracking the entire set of known Private DNS servers.
std::mutex privateDnsLock;
typedef std::set<DnsTlsTransport::Server, AddressComparator> PrivateDnsSet;
-PrivateDnsSet privateDnsServers;
+PrivateDnsSet privateDnsServers GUARDED_BY(privateDnsLock);
// Structure for tracking the validation status of servers on a specific netid.
// Servers that fail validation are removed from the tracker, and can be retried.
enum class Validation : bool { in_process, success };
typedef std::map<DnsTlsTransport::Server, Validation, AddressComparator> PrivateDnsTracker;
-std::map<unsigned, PrivateDnsTracker> privateDnsTransports;
+std::map<unsigned, PrivateDnsTracker> privateDnsTransports GUARDED_BY(privateDnsLock);
PrivateDnsSet parseServers(const char** servers, int numservers, in_port_t port) {
PrivateDnsSet set;