diff options
| author | Mike Yu <yumike@google.com> | 2020-11-09 17:09:14 +0800 |
|---|---|---|
| committer | Mike Yu <yumike@google.com> | 2020-11-18 17:49:10 +0800 |
| commit | 8d9da4ae6d04716590b6db112331d79a0e288e43 (patch) | |
| tree | 135b833373eb6be201b7a16c25e46df71bd05af2 /PrivateDnsConfiguration.cpp | |
| parent | 5e1b99187ecb5b6db507320475fd0464d2a24d83 (diff) | |
| download | DnsResolver-8d9da4ae6d04716590b6db112331d79a0e288e43.tar.gz | |
Decouple PrivateDnsConfiguration from resolv_cache.h
This change is to simplify writting tests for PrivateDnsConfiguration.
Also add a network ID check before starting any resolver configuration.
Bug: 79727473
Test: cd packages/modules/DnsResolver && atest
Change-Id: Icf0040c67aafe5318a61fc3d2b7158d8f0384367
Diffstat (limited to 'PrivateDnsConfiguration.cpp')
| -rw-r--r-- | PrivateDnsConfiguration.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/PrivateDnsConfiguration.cpp b/PrivateDnsConfiguration.cpp index d806fa0c..3a18f1ed 100644 --- a/PrivateDnsConfiguration.cpp +++ b/PrivateDnsConfiguration.cpp @@ -28,7 +28,6 @@ #include "ResolverEventReporter.h" #include "netd_resolv/resolv.h" #include "netdutils/BackoffSequence.h" -#include "resolv_cache.h" #include "util.h" using android::base::StringPrintf; @@ -90,7 +89,6 @@ int PrivateDnsConfiguration::set(int32_t netId, uint32_t mark, } else { mPrivateDnsModes[netId] = PrivateDnsMode::OFF; mPrivateDnsTransports.erase(netId); - resolv_stats_set_servers_for_dot(netId, {}); mPrivateDnsValidateThreads.erase(netId); // TODO: As mPrivateDnsValidateThreads is reset, validation threads which haven't yet // finished are considered outdated. Consider signaling the outdated validation threads to @@ -128,7 +126,7 @@ int PrivateDnsConfiguration::set(int32_t netId, uint32_t mark, } } - return resolv_stats_set_servers_for_dot(netId, servers); + return 0; } PrivateDnsStatus PrivateDnsConfiguration::getStatus(unsigned netId) { |