commit 95f5f94aa4c10893b9118b9b79138a1500b5d85b
author Pierre Imai <imaipi@google.com> Wed Mar 09 18:09:25 2016 +0900
committer Pierre Imai <imaipi@google.com> Wed Apr 06 11:20:03 2016 +0900
tree ac0604f2b9cf243225569a67bb505b87a18f2b6d
parent 2a83040825fcd68c04cab6cc7a373c8a1e9164d9

DO NOT MERGE: Let netd to use the new set_nameservers_for_net call.

Also add more test for netd's resolver.

(cherry picked from commit 12f6baf16328cdeea8f079616c2c44ac28f82496)

Change-Id: I446f11b3462522ec3a18c2a3ec9401ad6cf77e8b

server/ResolverController.cpp

diff --git a/server/ResolverController.cpp b/server/ResolverController.cpp
index 639423d..16cfd53 100644
--- a/server/ResolverController.cpp
+++ b/server/ResolverController.cpp
@@ -25,21 +25,21 @@
 //       declarations for _resolv_set_nameservers_for_net and
 //       _resolv_flush_cache_for_net
 #include <resolv_netid.h>
+#include <resolv_params.h>
 
 #include "ResolverController.h"
 
-int ResolverController::setDnsServers(unsigned netId, const char* domains,
-        const char** servers, int numservers) {
+int ResolverController::setDnsServers(unsigned netId, const char* searchDomains,
+        const char** servers, int numservers, const __res_params* params) {
     if (DBG) {
         ALOGD("setDnsServers netId = %u\n", netId);
     }
-    _resolv_set_nameservers_for_net(netId, servers, numservers, domains);
-
+    _resolv_set_nameservers_for_net(netId, servers, numservers, searchDomains, params);
     return 0;
 }
 
 int ResolverController::clearDnsServers(unsigned netId) {
-    _resolv_set_nameservers_for_net(netId, NULL, 0, "");
+    _resolv_set_nameservers_for_net(netId, NULL, 0, "", NULL);
     if (DBG) {
         ALOGD("clearDnsServers netId = %u\n", netId);
     }