Clean up Netd and libnetd_resolv for resolver related commands
1. remove all resolver related commands in netd
2. remove unused API in libnetd_resolv
Bug: 126141549
Test: built, flashed, booted
system/netd/tests/runtests.sh pass
Change-Id: I35ac8f241eebd6284a6a685ef86cd77a1fce4388
diff --git a/resolv/include/netd_resolv/resolv.h b/resolv/include/netd_resolv/resolv.h
index b5518e4..b6348c7 100644
--- a/resolv/include/netd_resolv/resolv.h
+++ b/resolv/include/netd_resolv/resolv.h
@@ -108,47 +108,39 @@
typedef bool (*check_calling_permission_callback)(const char* permission);
// TODO: Remove the callback after moving NAT64 prefix discovery out of netd to libnetd_resolv.
-typedef bool (*get_dns64_prefix_callback)(unsigned netid, in6_addr* prefix, uint8_t* prefix_len);
+typedef void (*log_callback)(const char* msg);
struct ResolverNetdCallbacks {
check_calling_permission_callback check_calling_permission;
get_network_context_callback get_network_context;
- get_dns64_prefix_callback get_dns64_prefix;
+ log_callback log;
};
-LIBNETD_RESOLV_PUBLIC int android_gethostbyaddrfornetcontext(const void*, socklen_t, int,
- const android_net_context*, hostent**);
-LIBNETD_RESOLV_PUBLIC int android_gethostbynamefornetcontext(const char*, int,
- const android_net_context*, hostent**);
-LIBNETD_RESOLV_PUBLIC int android_getaddrinfofornetcontext(const char*, const char*,
- const addrinfo*,
- const android_net_context*, addrinfo**);
-
-LIBNETD_RESOLV_PUBLIC bool resolv_has_nameservers(unsigned netid);
-
+int android_gethostbyaddrfornetcontext(const void*, socklen_t, int, const android_net_context*,
+ hostent**);
+int android_gethostbynamefornetcontext(const char*, int, const android_net_context*, hostent**);
+int android_getaddrinfofornetcontext(const char*, const char*, const addrinfo*,
+ const android_net_context*, addrinfo**);
// Query dns with raw msg
-LIBNETD_RESOLV_PUBLIC int resolv_res_nsend(const android_net_context* netContext,
- const uint8_t* msg, int msgLen, uint8_t* ans, int ansLen,
- int* rcode, uint32_t flags);
+int resolv_res_nsend(const android_net_context* netContext, const uint8_t* msg, int msgLen,
+ uint8_t* ans, int ansLen, int* rcode, uint32_t flags);
// 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);
+int resolv_set_nameservers_for_net(unsigned netid, const char** servers, int numservers,
+ const char* domains, const res_params* params);
-LIBNETD_RESOLV_PUBLIC int resolv_set_private_dns_for_net(unsigned netid, uint32_t mark,
- const char** servers, int numServers,
- const char* tlsName,
- const uint8_t** fingerprints,
- int numFingerprints);
+int resolv_set_private_dns_for_net(unsigned netid, uint32_t mark, const char** servers,
+ int numServers, const char* tlsName,
+ const uint8_t** fingerprints, int numFingerprints);
-LIBNETD_RESOLV_PUBLIC void resolv_delete_private_dns_for_net(unsigned netid);
+void resolv_delete_private_dns_for_net(unsigned netid);
-LIBNETD_RESOLV_PUBLIC void resolv_get_private_dns_status_for_net(unsigned netid,
- ExternalPrivateDnsStatus* status);
+void resolv_get_private_dns_status_for_net(unsigned netid, ExternalPrivateDnsStatus* status);
// Delete the cache associated with a certain network
-LIBNETD_RESOLV_PUBLIC void resolv_delete_cache_for_net(unsigned netid);
+void resolv_delete_cache_for_net(unsigned netid);
+
+LIBNETD_RESOLV_PUBLIC bool resolv_has_nameservers(unsigned netid);
// Set callbacks and bring DnsResolver up.
LIBNETD_RESOLV_PUBLIC bool resolv_init(const ResolverNetdCallbacks& callbacks);