commit ecc52827de6324fa2ae829ad96c1ce1c50d97d29
author Mike Yu <yumike@google.com> Fri Feb 14 14:36:46 2020 +0800
committer Mike Yu <yumike@google.com> Thu Feb 20 17:31:06 2020 +0800
tree 55634f44b1054e8a10d26ecf821400d26eed0f3d
parent 6407ae47fcaf8e00ac32f7fd9e65860952eeb3aa

Remove nscount in ResState and NetConfig

The number of nameservers can be derived from std::vector::size().
It doesn't need a variable to store the value.

Test: cd packages/modules/DnsResolver && atest
Change-Id: Ifc2e1401b1d081595a00b60fbaf6dd96c3d44a71

res_send.cpp

diff --git a/res_send.cpp b/res_send.cpp
index 1bbcfbc..012e680 100644
--- a/res_send.cpp
+++ b/res_send.cpp
@@ -430,7 +430,7 @@
         // data so the normal resolve path can do its thing
         resolv_populate_res_for_net(statp);
     }
-    if (statp->nscount == 0) {
+    if (statp->nameserverCount() == 0) {
         // We have no nameservers configured, so there's no point trying.
         // Tell the cache the query failed, or any retries and anyone else asking the same
         // question will block for PENDING_REQUEST_TIMEOUT seconds instead of failing fast.
@@ -470,14 +470,14 @@
     }
     bool usable_servers[MAXNS];
     int usableServersCount = android_net_res_stats_get_usable_servers(
-            &params, stats, statp->nscount, usable_servers);
+            &params, stats, statp->nameserverCount(), usable_servers);
 
     if ((flags & ANDROID_RESOLV_NO_RETRY) && usableServersCount > 1) {
         auto hp = reinterpret_cast<const HEADER*>(buf);
 
         // Select a random server based on the query id
         int selectedServer = (hp->id % usableServersCount) + 1;
-        res_set_usable_server(selectedServer, statp->nscount, usable_servers);
+        res_set_usable_server(selectedServer, statp->nameserverCount(), usable_servers);
     }
 
     // Send request, RETRY times, or until successful.
@@ -587,7 +587,7 @@
     // This has no effect with 1 or 2 nameservers
     msec = params->base_timeout_msec << ns;
     if (ns > 0) {
-        msec /= statp->nscount;
+        msec /= statp->nameserverCount();
     }
     // For safety, don't allow OEMs and experiments to configure a timeout shorter than 1s.
     if (msec < 1000) {