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
diff --git a/resolv/include/netd_resolv/params.h b/resolv/include/netd_resolv/params.h
index c565753..ec61445 100644
--- a/resolv/include/netd_resolv/params.h
+++ b/resolv/include/netd_resolv/params.h
@@ -19,15 +19,13 @@
#include <stdint.h>
-/* Hard-coded defines */
-#define MAXNS 4 /* max # name servers we'll track */
-#define MAXDNSRCH 6 /* max # domains in search path */
-#define MAXDNSRCHPATH 256 /* max length of domain search paths */
-#define MAXNSSAMPLES 64 /* max # samples to store per server */
+#define MAXNS 4 // max # name servers we'll track
+#define MAXDNSRCH 6 // max # domains in search path
+#define MAXDNSRCHPATH 256 // max length of domain search paths
+#define MAXNSSAMPLES 64 // max # samples to store per server
// Per-netid configuration parameters passed from netd to the resolver
-// TODO: rename to res_params
-struct __res_params {
+struct res_params {
uint16_t sample_validity; // sample lifetime in s
// threshold of success / total samples below which a server is considered broken
uint8_t success_threshold; // 0: disable, value / 100 otherwise
diff --git a/resolv/include/netd_resolv/resolv.h b/resolv/include/netd_resolv/resolv.h
index f79ec64..2e65370 100644
--- a/resolv/include/netd_resolv/resolv.h
+++ b/resolv/include/netd_resolv/resolv.h
@@ -28,15 +28,13 @@
#ifndef NETD_RESOLV_RESOLV_H
#define NETD_RESOLV_RESOLV_H
-/*
- * This header contains declarations related to per-network DNS server selection.
- * They are used by system/netd/ and should not be exposed by the public NDK headers.
- */
-#include <android/multinetwork.h> // ResNsendFlags
+#include "params.h"
#include <netinet/in.h>
-#include "params.h"
+struct addrinfo;
+struct hostent;
+struct res_params;
typedef union sockaddr_union {
struct sockaddr sa;
@@ -62,10 +60,6 @@
*/
#define NETD_RESOLV_TIMEOUT 255 // consistent with RCODE_TIMEOUT
-struct __res_params;
-struct addrinfo;
-struct hostent;
-
/*
* A struct to capture context relevant to network operations.
*
@@ -140,7 +134,7 @@
// Set name servers for a network
LIBNETD_RESOLV_PUBLIC int resolv_set_nameservers_for_net(unsigned netid, const char** servers,
int numservers, const char* domains,
- const __res_params* params);
+ const res_params* params);
LIBNETD_RESOLV_PUBLIC int resolv_set_private_dns_for_net(unsigned netid, uint32_t mark,
const char** servers, int numServers,
diff --git a/resolv/include/netd_resolv/resolv_stub.h b/resolv/include/netd_resolv/resolv_stub.h
index 32710db..c5ed19e 100644
--- a/resolv/include/netd_resolv/resolv_stub.h
+++ b/resolv/include/netd_resolv/resolv_stub.h
@@ -44,10 +44,10 @@
int (*android_net_res_stats_get_info_for_net)(unsigned netid, int* nscount,
sockaddr_storage servers[MAXNS], int* dcount,
char domains[MAXDNSRCH][MAXDNSRCHPATH],
- __res_params* params, res_stats stats[MAXNS],
+ res_params* params, res_stats stats[MAXNS],
int* wait_for_pending_req_timeout_count);
- void (*android_net_res_stats_get_usable_servers)(const __res_params* params, res_stats stats[],
+ void (*android_net_res_stats_get_usable_servers)(const res_params* params, res_stats stats[],
int nscount, bool valid_servers[]);
void (*resolv_delete_cache_for_net)(unsigned netid);
@@ -61,7 +61,7 @@
bool (*resolv_init)(const dnsproxylistener_callbacks& callbacks);
int (*resolv_set_nameservers_for_net)(unsigned netid, const char** servers, unsigned numservers,
- const char* domains, const __res_params* params);
+ const char* domains, const res_params* params);
int (*resolv_set_private_dns_for_net)(unsigned netid, uint32_t mark, const char** servers,
const unsigned numServers, const char* tlsName,
diff --git a/resolv/include/netd_resolv/stats.h b/resolv/include/netd_resolv/stats.h
index e078e72..94e964b 100644
--- a/resolv/include/netd_resolv/stats.h
+++ b/resolv/include/netd_resolv/stats.h
@@ -51,11 +51,11 @@
LIBNETD_RESOLV_PUBLIC int android_net_res_stats_get_info_for_net(
unsigned netid, int* nscount, sockaddr_storage servers[MAXNS], int* dcount,
- char domains[MAXDNSRCH][MAXDNSRCHPATH], __res_params* params, res_stats stats[MAXNS],
+ char domains[MAXDNSRCH][MAXDNSRCHPATH], res_params* params, res_stats stats[MAXNS],
int* wait_for_pending_req_timeout_count);
// Returns an array of bools indicating which servers are considered good
-LIBNETD_RESOLV_PUBLIC void android_net_res_stats_get_usable_servers(const __res_params* params,
+LIBNETD_RESOLV_PUBLIC void android_net_res_stats_get_usable_servers(const res_params* params,
res_stats stats[], int nscount,
bool valid_servers[]);