commit 66810f63f1229909399790f00c48012b76f04dc9
author Ben Schwartz <bemasc@google.com> Mon Oct 16 19:27:46 2017 -0400
committer Ben Schwartz <bemasc@google.com> Tue Oct 31 17:01:03 2017 -0400
tree 7d21718007d6326c0862381d6dc40e10c484ddad
parent a13c23a11653138b743a3b1be85805f07cc8f3d4

Refactor DnsTlsTransport

This change does not alter any functionality.

This refactor does change the locking design.  There is now
one lock for the dispatcher and one for each transport.

Test: Integration tests pass
Bug: 63447621
Change-Id: Ief9d4c4ed76bc66b85fce888b0b09b8d38940aa4

server/ResolverController.h

diff --git a/server/ResolverController.h b/server/ResolverController.h
index 383b1ab..a071e01 100644
--- a/server/ResolverController.h
+++ b/server/ResolverController.h
@@ -18,7 +18,6 @@
 #define _RESOLVER_CONTROLLER_H_
 
 #include <vector>
-#include "dns/DnsTlsTransport.h"
 
 struct __res_params;
 struct sockaddr_storage;
@@ -26,6 +25,7 @@
 namespace android {
 namespace net {
 
+struct DnsTlsServer;
 class DumpWriter;
 struct ResolverStats;
 
@@ -47,7 +47,7 @@
     // accessible on this netId.  It returns the validation status, and provides the secure server
     // (including port, name, and fingerprints) in the output parameter.
     Validation getTlsStatus(unsigned netId, const sockaddr_storage& insecureServer,
-            DnsTlsTransport::Server* secureServer);
+            DnsTlsServer* secureServer);
 
     int clearDnsServers(unsigned netid);