Rename ResolverExperimentalOptions to ResolverOptions
Remove 'Experimental' from parcel name and variable name for better
naming.
Bug: 139646101
Change-Id: Iaa75e8028e98998eca4c9b821aa07effab19dac3
diff --git a/Android.bp b/Android.bp
index ccd7d58..4805bb8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,7 +16,7 @@
srcs: [
"binder/android/net/IDnsResolver.aidl",
"binder/android/net/ResolverHostsParcel.aidl",
- "binder/android/net/ResolverExperimentalOptionsParcel.aidl",
+ "binder/android/net/ResolverOptionsParcel.aidl",
"binder/android/net/ResolverParamsParcel.aidl",
],
imports: [
diff --git a/ResolverController.cpp b/ResolverController.cpp
index b8a8284..13600b8 100644
--- a/ResolverController.cpp
+++ b/ResolverController.cpp
@@ -231,9 +231,9 @@
res_params.base_timeout_msec = resolverParams.baseTimeoutMsec;
res_params.retry_count = resolverParams.retryCount;
- return resolv_set_nameservers(
- resolverParams.netId, resolverParams.servers, resolverParams.domains, res_params,
- resolverParams.experimentalOptions, resolverParams.transportTypes);
+ return resolv_set_nameservers(resolverParams.netId, resolverParams.servers,
+ resolverParams.domains, res_params,
+ resolverParams.resolverOptions, resolverParams.transportTypes);
}
int ResolverController::getResolverInfo(int32_t netId, std::vector<std::string>* servers,
diff --git a/aidl_api/dnsresolver_aidl_interface/current/android/net/ResolverExperimentalOptionsParcel.aidl b/aidl_api/dnsresolver_aidl_interface/current/android/net/ResolverOptionsParcel.aidl
similarity index 95%
rename from aidl_api/dnsresolver_aidl_interface/current/android/net/ResolverExperimentalOptionsParcel.aidl
rename to aidl_api/dnsresolver_aidl_interface/current/android/net/ResolverOptionsParcel.aidl
index 07a1143..a13216a 100644
--- a/aidl_api/dnsresolver_aidl_interface/current/android/net/ResolverExperimentalOptionsParcel.aidl
+++ b/aidl_api/dnsresolver_aidl_interface/current/android/net/ResolverOptionsParcel.aidl
@@ -17,7 +17,7 @@
package android.net;
/* @hide */
-parcelable ResolverExperimentalOptionsParcel {
+parcelable ResolverOptionsParcel {
android.net.ResolverHostsParcel[] hosts = {};
int tcMode = 0;
}
diff --git a/aidl_api/dnsresolver_aidl_interface/current/android/net/ResolverParamsParcel.aidl b/aidl_api/dnsresolver_aidl_interface/current/android/net/ResolverParamsParcel.aidl
index d9b4f0f..5dae1ca 100644
--- a/aidl_api/dnsresolver_aidl_interface/current/android/net/ResolverParamsParcel.aidl
+++ b/aidl_api/dnsresolver_aidl_interface/current/android/net/ResolverParamsParcel.aidl
@@ -32,6 +32,6 @@
@utf8InCpp String[] tlsFingerprints = {};
@utf8InCpp String caCertificate = "";
int tlsConnectTimeoutMs = 0;
- android.net.ResolverExperimentalOptionsParcel experimentalOptions;
+ android.net.ResolverOptionsParcel resolverOptions;
int[] transportTypes = {};
}
diff --git a/binder/android/net/IDnsResolver.aidl b/binder/android/net/IDnsResolver.aidl
index dc49770..da13d21 100644
--- a/binder/android/net/IDnsResolver.aidl
+++ b/binder/android/net/IDnsResolver.aidl
@@ -172,7 +172,7 @@
void flushNetworkCache(int netId);
/**
- * Values for {@code tcMode} of {@code ResolverExperimentalOptionsParcel}. It controls the way DNS
+ * Values for {@code tcMode} of {@code ResolverOptionsParcel}. It controls the way DNS
* resolver handles truncated DNS response from UDP connection.
*
* TC_MODE_DEFAULT: resolver retries on TCP-only on each name server.
diff --git a/binder/android/net/ResolverExperimentalOptionsParcel.aidl b/binder/android/net/ResolverOptionsParcel.aidl
similarity index 96%
rename from binder/android/net/ResolverExperimentalOptionsParcel.aidl
rename to binder/android/net/ResolverOptionsParcel.aidl
index f8fd589..8e435de 100644
--- a/binder/android/net/ResolverExperimentalOptionsParcel.aidl
+++ b/binder/android/net/ResolverOptionsParcel.aidl
@@ -23,7 +23,7 @@
*
* {@hide}
*/
-parcelable ResolverExperimentalOptionsParcel {
+parcelable ResolverOptionsParcel {
/**
* An IP/hostname mapping table for DNS local lookup customization.
* WARNING: this is intended for local testing and other special situations.
diff --git a/binder/android/net/ResolverParamsParcel.aidl b/binder/android/net/ResolverParamsParcel.aidl
index 38d6367..9a8e843 100644
--- a/binder/android/net/ResolverParamsParcel.aidl
+++ b/binder/android/net/ResolverParamsParcel.aidl
@@ -16,7 +16,7 @@
package android.net;
-import android.net.ResolverExperimentalOptionsParcel;
+import android.net.ResolverOptionsParcel;
/**
* Configuration for a resolver parameters.
@@ -103,7 +103,7 @@
/**
* Knobs for OEM to control alternative behavior.
*/
- ResolverExperimentalOptionsParcel experimentalOptions;
+ ResolverOptionsParcel resolverOptions;
/**
* The transport types associated to a given network.
diff --git a/res_cache.cpp b/res_cache.cpp
index 04e16bd..1caf6dc 100644
--- a/res_cache.cpp
+++ b/res_cache.cpp
@@ -1579,11 +1579,10 @@
return result;
}
-int resolv_set_nameservers(
- unsigned netid, const std::vector<std::string>& servers,
- const std::vector<std::string>& domains, const res_params& params,
- const aidl::android::net::ResolverExperimentalOptionsParcel& experimentalOptions,
- const std::vector<int32_t>& transportTypes) {
+int resolv_set_nameservers(unsigned netid, const std::vector<std::string>& servers,
+ const std::vector<std::string>& domains, const res_params& params,
+ const aidl::android::net::ResolverOptionsParcel& resolverOptions,
+ const std::vector<int32_t>& transportTypes) {
std::vector<std::string> nameservers = filter_nameservers(servers);
const int numservers = static_cast<int>(nameservers.size());
@@ -1637,18 +1636,18 @@
return -EINVAL;
}
netconfig->customizedTable.clear();
- for (const auto& host : experimentalOptions.hosts) {
+ for (const auto& host : resolverOptions.hosts) {
if (!host.hostName.empty() && !host.ipAddr.empty())
netconfig->customizedTable.emplace(host.hostName, host.ipAddr);
}
- if (experimentalOptions.tcMode < aidl::android::net::IDnsResolver::TC_MODE_DEFAULT ||
- experimentalOptions.tcMode > aidl::android::net::IDnsResolver::TC_MODE_UDP_TCP) {
+ if (resolverOptions.tcMode < aidl::android::net::IDnsResolver::TC_MODE_DEFAULT ||
+ resolverOptions.tcMode > aidl::android::net::IDnsResolver::TC_MODE_UDP_TCP) {
LOG(WARNING) << __func__ << ": netid = " << netid
- << ", invalid TC mode: " << experimentalOptions.tcMode;
+ << ", invalid TC mode: " << resolverOptions.tcMode;
return -EINVAL;
}
- netconfig->tc_mode = experimentalOptions.tcMode;
+ netconfig->tc_mode = resolverOptions.tcMode;
netconfig->transportTypes = transportTypes;
diff --git a/resolv_cache.h b/resolv_cache.h
index be6c988..49c7f56 100644
--- a/resolv_cache.h
+++ b/resolv_cache.h
@@ -32,7 +32,7 @@
#include <vector>
#include <aidl/android/net/IDnsResolver.h>
-#include <aidl/android/net/ResolverExperimentalOptionsParcel.h>
+#include <aidl/android/net/ResolverOptionsParcel.h>
#include <netdutils/DumpWriter.h>
#include <netdutils/InternetAddresses.h>
@@ -80,12 +80,12 @@
// Sets name servers for a given network.
// TODO: Pass all of ResolverParamsParcel and remove the res_params argument.
-int resolv_set_nameservers(
- unsigned netid, const std::vector<std::string>& servers,
- const std::vector<std::string>& domains, const res_params& params,
- const aidl::android::net::ResolverExperimentalOptionsParcel& experimentalOptions =
- {{} /* hosts */, aidl::android::net::IDnsResolver::TC_MODE_DEFAULT},
- const std::vector<int32_t>& transportTypes = {});
+int resolv_set_nameservers(unsigned netid, const std::vector<std::string>& servers,
+ const std::vector<std::string>& domains, const res_params& params,
+ const aidl::android::net::ResolverOptionsParcel& resolverOptions =
+ {{} /* hosts */,
+ aidl::android::net::IDnsResolver::TC_MODE_DEFAULT},
+ const std::vector<int32_t>& transportTypes = {});
// Creates the cache associated with the given network.
int resolv_create_cache_for_net(unsigned netid);
diff --git a/resolv_cache_unit_test.cpp b/resolv_cache_unit_test.cpp
index 2ef4126..f7c1733 100644
--- a/resolv_cache_unit_test.cpp
+++ b/resolv_cache_unit_test.cpp
@@ -61,7 +61,7 @@
std::vector<std::string> servers;
std::vector<std::string> domains;
res_params params;
- aidl::android::net::ResolverExperimentalOptionsParcel experimentalOptions;
+ aidl::android::net::ResolverOptionsParcel resolverOptions;
std::vector<int32_t> transportTypes;
};
@@ -194,7 +194,7 @@
int cacheSetupResolver(uint32_t netId, const SetupParams& setup) {
return resolv_set_nameservers(netId, setup.servers, setup.domains, setup.params,
- setup.experimentalOptions, setup.transportTypes);
+ setup.resolverOptions, setup.transportTypes);
}
void cacheAddStats(uint32_t netId, int revision_id, const IPSockAddr& ipsa,
diff --git a/tests/resolv_integration_test.cpp b/tests/resolv_integration_test.cpp
index 9dda0f1..270f040 100644
--- a/tests/resolv_integration_test.cpp
+++ b/tests/resolv_integration_test.cpp
@@ -1087,7 +1087,7 @@
test::DNSResponder dns;
StartDns(dns, {});
auto resolverParams = DnsResponderClient::GetDefaultResolverParamsParcel();
- resolverParams.experimentalOptions.hosts = invalidCustHosts;
+ resolverParams.resolverOptions.hosts = invalidCustHosts;
ASSERT_TRUE(mDnsClient.resolvService()->setResolverConfiguration(resolverParams).isOk());
for (const auto& hostname : {hostnameNoip, hostnameInvalidip}) {
// The query won't get data from customized table because of invalid customized table
@@ -1162,7 +1162,7 @@
StartDns(dns, config.dnsserverHosts);
auto resolverParams = DnsResponderClient::GetDefaultResolverParamsParcel();
- resolverParams.experimentalOptions.hosts = config.customizedHosts;
+ resolverParams.resolverOptions.hosts = config.customizedHosts;
ASSERT_TRUE(mDnsClient.resolvService()->setResolverConfiguration(resolverParams).isOk());
const addrinfo hints = {.ai_family = AF_UNSPEC, .ai_socktype = SOCK_STREAM};
ScopedAddrinfo result = safe_getaddrinfo(config.name.c_str(), nullptr, &hints);
@@ -1198,7 +1198,7 @@
StartDns(dns, dnsSvHostV4V6);
auto resolverParams = DnsResponderClient::GetDefaultResolverParamsParcel();
- resolverParams.experimentalOptions.hosts = custHostV4V6;
+ resolverParams.resolverOptions.hosts = custHostV4V6;
ASSERT_TRUE(mDnsClient.resolvService()->setResolverConfiguration(resolverParams).isOk());
const addrinfo hints = {.ai_family = AF_UNSPEC, .ai_socktype = SOCK_STREAM};
ScopedAddrinfo result = safe_getaddrinfo(hostnameV4V6, nullptr, &hints);
@@ -1206,7 +1206,7 @@
EXPECT_THAT(ToStrings(result), testing::UnorderedElementsAreArray({custAddrV4, custAddrV6}));
EXPECT_EQ(0U, GetNumQueries(dns, hostnameV4V6));
- resolverParams.experimentalOptions.hosts = {};
+ resolverParams.resolverOptions.hosts = {};
ASSERT_TRUE(mDnsClient.resolvService()->setResolverConfiguration(resolverParams).isOk());
result = safe_getaddrinfo(hostnameV4V6, nullptr, &hints);
ASSERT_TRUE(result != nullptr);
@@ -4139,7 +4139,7 @@
ResolverParamsParcel parcel = DnsResponderClient::GetDefaultResolverParamsParcel();
parcel.servers = {listen_addr, listen_addr2};
if (config.tcMode) {
- parcel.experimentalOptions.tcMode = config.tcMode.value();
+ parcel.resolverOptions.tcMode = config.tcMode.value();
}
ASSERT_EQ(mDnsClient.resolvService()->setResolverConfiguration(parcel).isOk(), config.ret);