commit 3e5c35f3979952805cc0d0c4c5a64b58f903fef3
author chenbruce <chenbruce@google.com> Thu Feb 20 14:08:25 2020 +0800
committer chenbruce <chenbruce@google.com> Wed Apr 01 08:51:19 2020 +0800
tree 199e8e42518c3eefebd1abf39dd57bafb3bf80c8
parent 1ba6afa3e2214feb277839b6ec2bfa09cc5c1c81

Add transport types to a given network

- Resolver doesn't know what the transport types are when having a given
  network. Set tranport types by SetResolverConfiguration.

Bug: 143732914
Test: atest

Change-Id: I337d4204afd9fbb790fd42cc191759b22dd66bca

ResolverController.cpp

diff --git a/ResolverController.cpp b/ResolverController.cpp
index c59676a..c6425ba 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);
+    return resolv_set_nameservers(
+            resolverParams.netId, resolverParams.servers, resolverParams.domains, res_params,
+            resolverParams.experimentalOptions, resolverParams.transportTypes);
 }
 
 int ResolverController::getResolverInfo(int32_t netId, std::vector<std::string>* servers,
@@ -362,8 +362,7 @@
             dw.decIndent();
         }
         dw.println("Concurrent DNS query timeout: %d", wait_for_pending_req_timeout_count[0]);
-        resolv_stats_dump(dw, netId);
-        resolv_oem_options_dump(dw, netId);
+        resolv_netconfig_dump(dw, netId);
     }
     dw.decIndent();
 }