commit 34de3ba1ffb594b35935fdd110dce1af3f5f4503
author Bernie Innocenti <codewiz@google.com> Tue Feb 19 18:08:36 2019 +0900
committer Bernie Innocenti <codewiz@google.com> Thu Feb 21 06:15:00 2019 +0000
tree bab1829a6177cf84a94c5c6c666b9142d61db11c
parent 111c1ba88139c3647de0148f62a46fcd0cda3740

Rename struct __res_params to res_params

The double-underscore prefixes are a leftover from when this code lived
in bionic. Now we're slowly getting rid of them...

Also cleanup transitive includes a bit.

Test: atest resolv_integration_test resolv_unit_test
Change-Id: I65ed8aed273be4af37a982a167f364a1f33f9a36

resolv/res_cache.cpp

diff --git a/resolv/res_cache.cpp b/resolv/res_cache.cpp
index 8d498ab..98e6909 100644
--- a/resolv/res_cache.cpp
+++ b/resolv/res_cache.cpp
@@ -32,6 +32,8 @@
 constexpr bool kDumpData = false;
 #define LOG_TAG "res_cache"
 
+#include "resolv_cache.h"
+
 #include <resolv.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -49,9 +51,9 @@
 
 #include <android-base/logging.h>
 #include <android-base/thread_annotations.h>
+#include <android/multinetwork.h>  // ResNsendFlags
 
 #include "res_state_ext.h"
-#include "resolv_cache.h"
 #include "resolv_private.h"
 
 #define VLOG if (!kVerboseLogging) {} else LOG(INFO)
@@ -187,7 +189,7 @@
  *     printf( "%s", buff );
  */
 
-/* Defaults used for initializing __res_params */
+/* Defaults used for initializing res_params */
 
 // If successes * 100 / total_samples is less than this value, the server is considered failing
 #define SUCCESS_THRESHOLD 75
@@ -1145,7 +1147,7 @@
     char* nameservers[MAXNS];
     struct addrinfo* nsaddrinfo[MAXNS];
     int revision_id;  // # times the nameservers have been replaced
-    struct __res_params params;
+    res_params params;
     struct res_stats nsstats[MAXNS];
     char defdname[MAXDNSRCHPATH];
     int dnsrch_offset[MAXDNSRCH + 1];  // offsets into defdname
@@ -1709,7 +1711,7 @@
     return cache_info;
 }
 
-static void resolv_set_default_params(struct __res_params* params) {
+static void resolv_set_default_params(res_params* params) {
     params->sample_validity = NSSAMPLE_VALIDITY;
     params->success_threshold = SUCCESS_THRESHOLD;
     params->min_samples = 0;
@@ -1719,7 +1721,7 @@
 }
 
 int resolv_set_nameservers_for_net(unsigned netid, const char** servers, const int numservers,
-                                   const char* domains, const __res_params* params) {
+                                   const char* domains, const res_params* params) {
     char* cp;
     int* offset;
     struct addrinfo* nsaddrinfo[MAXNS];
@@ -1940,8 +1942,7 @@
 int android_net_res_stats_get_info_for_net(unsigned netid, int* nscount,
                                            struct sockaddr_storage servers[MAXNS], int* dcount,
                                            char domains[MAXDNSRCH][MAXDNSRCHPATH],
-                                           struct __res_params* params,
-                                           struct res_stats stats[MAXNS],
+                                           res_params* params, struct res_stats stats[MAXNS],
                                            int* wait_for_pending_req_timeout_count) {
     int revision_id = -1;
     std::lock_guard guard(cache_mutex);
@@ -2002,7 +2003,7 @@
     return revision_id;
 }
 
-int resolv_cache_get_resolver_stats(unsigned netid, __res_params* params, res_stats stats[MAXNS]) {
+int resolv_cache_get_resolver_stats(unsigned netid, res_params* params, res_stats stats[MAXNS]) {
     std::lock_guard guard(cache_mutex);
     resolv_cache_info* info = find_cache_info_locked(netid);
     if (info) {