commit 37255186917eda385f6bbeef0732b71994e69fa4
author waynema <waynema@google.com> Mon Mar 18 13:22:56 2019 +0800
committer Wayne Ma <waynema@google.com> Wed Apr 17 13:56:42 2019 +0000
tree 0dc72bb5e87ef6719ed531f1641c2ba599a2320f
parent 5b24e212dd75e0ff65651d87f43b37fd07cba49f

Backwards-incompatible resolv module API change for making setResolverConfiguration take a parcelable.

Test: built, flashed, booted
      system/netd/tests/runtests.sh pass
Change-Id: I755b7832d395ab138d5440abdcb9d86fde0a00e3

DnsResolverService.cpp

diff --git a/DnsResolverService.cpp b/DnsResolverService.cpp
index a1efb82..0fd6de9 100644
--- a/DnsResolverService.cpp
+++ b/DnsResolverService.cpp
@@ -36,6 +36,7 @@
 #include "netdutils/DumpWriter.h"
 #include "resolv_cache.h"
 
+using aidl::android::net::ResolverParamsParcel;
 using android::base::Join;
 using android::base::StringPrintf;
 using android::netdutils::DumpWriter;
@@ -186,19 +187,19 @@
 }  // namespace
 
 ::ndk::ScopedAStatus DnsResolverService::setResolverConfiguration(
-        int32_t netId, const std::vector<std::string>& servers,
-        const std::vector<std::string>& domains, const std::vector<int32_t>& params,
-        const std::string& tlsName, const std::vector<std::string>& tlsServers,
-        const std::vector<std::string>& tlsFingerprints) {
+        const ResolverParamsParcel& resolverParams) {
     // Locking happens in PrivateDnsConfiguration and res_* functions.
     ENFORCE_INTERNAL_PERMISSIONS();
     auto entry =
             gDnsResolverLog.newEntry()
                     .prettyFunction(__PRETTY_FUNCTION__)
-                    .args(netId, servers, domains, params, tlsName, tlsServers, tlsFingerprints);
+                    .args(resolverParams.netId, resolverParams.servers, resolverParams.domains,
+                          resolverParams.sampleValiditySeconds, resolverParams.successThreshold,
+                          resolverParams.minSamples, resolverParams.maxSamples,
+                          resolverParams.baseTimeoutMsec, resolverParams.retryCount);
 
     std::set<std::vector<uint8_t>> decoded_fingerprints;
-    for (const std::string& fingerprint : tlsFingerprints) {
+    for (const std::string& fingerprint : resolverParams.tlsFingerprints) {
         std::vector<uint8_t> decoded = parseBase64(fingerprint);
         if (decoded.empty()) {
             return ::ndk::ScopedAStatus(AStatus_fromServiceSpecificErrorWithMessage(
@@ -207,8 +208,8 @@
         decoded_fingerprints.emplace(decoded);
     }
 
-    int err = gDnsResolv->resolverCtrl.setResolverConfiguration(
-            netId, servers, domains, params, tlsName, tlsServers, decoded_fingerprints);
+    int err =
+            gDnsResolv->resolverCtrl.setResolverConfiguration(resolverParams, decoded_fingerprints);
 
     gResNetdCallbacks.log(entry.returns(err).withAutomaticDuration().toString().c_str());
     if (err != 0) {