diff options
Diffstat (limited to 'tests/dns_responder/dns_responder_client_ndk.cpp')
| -rw-r--r-- | tests/dns_responder/dns_responder_client_ndk.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/tests/dns_responder/dns_responder_client_ndk.cpp b/tests/dns_responder/dns_responder_client_ndk.cpp index ee360dc2..b69ce183 100644 --- a/tests/dns_responder/dns_responder_client_ndk.cpp +++ b/tests/dns_responder/dns_responder_client_ndk.cpp @@ -30,6 +30,7 @@ using aidl::android::net::IDnsResolver; using aidl::android::net::INetd; using aidl::android::net::ResolverOptionsParcel; using aidl::android::net::ResolverParamsParcel; +using aidl::android::net::resolv::aidl::DohParamsParcel; using android::base::Error; using android::base::Result; using android::net::ResolverStats; @@ -51,6 +52,7 @@ ResolverParams::Builder::Builder() { mParcel.tlsServers = {kDefaultServer}; mParcel.caCertificate = kCaCert; mParcel.resolverOptions = ResolverOptionsParcel{}; // optional, must be explicitly set. + mParcel.dohParams = std::nullopt; } void DnsResponderClient::SetupMappings(unsigned numHosts, const std::vector<std::string>& domains, @@ -116,22 +118,6 @@ Result<ResolverInfo> DnsResponderClient::getResolverInfo() { } bool DnsResponderClient::SetResolversForNetwork(const std::vector<std::string>& servers, - const std::vector<std::string>& domains, - std::vector<int> params) { - params.resize(IDnsResolver::RESOLVER_PARAMS_COUNT); - std::array<int, IDnsResolver::RESOLVER_PARAMS_COUNT> arr; - std::copy_n(params.begin(), arr.size(), arr.begin()); - const auto resolverParams = ResolverParams::Builder() - .setDomains(domains) - .setDnsServers(servers) - .setDotServers({}) - .setParams(arr) - .build(); - const auto rv = mDnsResolvSrv->setResolverConfiguration(resolverParams); - return rv.isOk(); -} - -bool DnsResponderClient::SetResolversForNetwork(const std::vector<std::string>& servers, const std::vector<std::string>& domains) { const auto resolverParams = ResolverParams::Builder() .setDomains(domains) |