resolv: dead code removal
- hostalias() and res_hostalias(): these were no-ops
- res_opt(), res_querydomain(), p_option(), p_query(),
res_isourserver(), res_nisourserver(): had no callers
- res_ourserver_p(): made local to res_data.cpp
- res_send_setqhook(): unused, DnsProxyListener sets the qhook directly
in android_net_context, which is then copied to res_state by
res_setnetcontext(). We can further simplify it later on.
Test: atest netd_integration_test
Change-Id: I70f72202e5b940986cac67dc99ab9461af882187
diff --git a/resolv/resolv_private.h b/resolv/resolv_private.h
index b633920..8c37dd2 100644
--- a/resolv/resolv_private.h
+++ b/resolv/resolv_private.h
@@ -217,7 +217,6 @@
#define RES_DNSRCH 0x00000200 /* search up local domain tree */
#define RES_INSECURE1 0x00000400 /* type 1 security disabled */
#define RES_INSECURE2 0x00000800 /* type 2 security disabled */
-#define RES_NOALIASES 0x00001000 /* shuts off HOSTALIASES feature */
#define RES_USE_INET6 0x00002000 /* use/map IPv6 in gethostbyname() */
#define RES_ROTATE 0x00004000 /* rotate ns list after each query */
#define RES_NOCHECKNAME 0x00008000 /* do not check names for sanity. */
@@ -255,80 +254,17 @@
/* 0x00010000 */
/* Things involving an internal (static) resolver context. */
-struct __res_state* __res_get_state(void);
-void __res_put_state(struct __res_state*);
+struct __res_state* res_get_state(void);
+void res_put_state(struct __res_state*);
-#define fp_nquery __fp_nquery
-#define fp_query __fp_query
-#define hostalias __hostalias
-#define p_query __p_query
-#define res_close __res_close
-#define res_opt __res_opt
-#define res_isourserver __res_isourserver
-#define res_querydomain __res_querydomain
-#define res_send __res_send
-#define res_sendsigned __res_sendsigned
-
-const char* hostalias(const char*);
-void p_query(const u_char*);
void res_close(void);
int res_init(void);
-int res_opt(int, u_char*, int, int);
-int res_isourserver(const struct sockaddr_in*);
int res_mkquery(int, const char*, int, int, const u_char*, int, const u_char*, u_char*, int);
int res_query(const char*, int, int, u_char*, int);
-int res_querydomain(const char*, const char*, int, int, u_char*, int);
int res_search(const char*, int, int, u_char*, int);
int res_send(const u_char*, int, u_char*, int);
int res_sendsigned(const u_char*, int, ns_tsig_key*, u_char*, int);
-#define dn_count_labels __dn_count_labels
-#define dn_skipname __dn_skipname
-#define fp_resstat __fp_resstat
-#define loc_aton __loc_aton
-#define loc_ntoa __loc_ntoa
-#define p_cdname __p_cdname
-#define p_cdnname __p_cdnname
-#define p_class __p_class
-#define p_fqname __p_fqname
-#define p_fqnname __p_fqnname
-#define p_option __p_option
-#define p_secstodate __p_secstodate
-#define p_section __p_section
-#define p_time __p_time
-#define p_rcode __p_rcode
-#define p_sockun __p_sockun
-#define putlong __putlong
-#define putshort __putshort
-#define res_dnok __res_dnok
-#define res_findzonecut __res_findzonecut
-#define res_findzonecut2 __res_findzonecut2
-#define res_hnok __res_hnok
-#define res_hostalias __res_hostalias
-#define res_mailok __res_mailok
-#define res_nameinquery __res_nameinquery
-#define res_nclose __res_nclose
-#define res_ninit __res_ninit
-#define res_nmkquery __res_nmkquery
-#define res_pquery __res_pquery
-#define res_nquery __res_nquery
-#define res_nquerydomain __res_nquerydomain
-#define res_nsearch __res_nsearch
-#define res_nsend __res_nsend
-#define res_nsendsigned __res_nsendsigned
-#define res_nisourserver __res_nisourserver
-#define res_ownok __res_ownok
-#define res_queriesmatch __res_queriesmatch
-#define res_nopt __res_nopt
-#define res_ndestroy __res_ndestroy
-#define res_setservers __res_setservers
-#define res_getservers __res_getservers
-#define res_buildprotolist __res_buildprotolist
-#define res_ourserver_p __res_ourserver_p
-#define res_send_setqhook __res_send_setqhook
-#define res_send_setrhook __res_send_setrhook
-#define res_servicename __res_servicename
-#define res_servicenumber __res_servicenumber
int res_hnok(const char*);
int res_ownok(const char*);
int res_mailok(const char*);
@@ -347,7 +283,6 @@
const u_char* p_cdname(const u_char*, const u_char*, FILE*);
const u_char* p_fqnname(const u_char*, const u_char*, int, char*, int);
const u_char* p_fqname(const u_char*, const u_char*, FILE*);
-const char* p_option(u_long);
char* p_secstodate(u_long);
int dn_count_labels(const char*);
int res_nameinquery(const char*, int, int, const u_char*, const u_char*);
@@ -355,10 +290,8 @@
const char* p_section(int, int);
/* Things involving a resolver context. */
int res_ninit(res_state);
-int res_nisourserver(const res_state, const struct sockaddr_in*);
void fp_resstat(const res_state, FILE*);
void res_pquery(const res_state, const u_char*, int, FILE*);
-const char* res_hostalias(const res_state, const char*, char*, size_t);
int res_nquery(res_state, const char*, int, int, u_char*, int);
int res_nsearch(res_state, const char*, int, int, u_char*, int);
int res_nquerydomain(res_state, const char*, const char*, int, int, u_char*, int);
@@ -371,11 +304,7 @@
union res_sockaddr_union*, int);
void res_nclose(res_state);
int res_nopt(res_state, int, u_char*, int, int);
-void res_send_setqhook(res_send_qhook);
-void res_send_setrhook(res_send_rhook);
-int __res_vinit(res_state, int);
-const char* res_servicename(uint16_t, const char*);
-void res_buildprotolist(void);
+int res_vinit(res_state, int);
void res_ndestroy(res_state);
void res_setservers(res_state, const union res_sockaddr_union*, int);
int res_getservers(res_state, union res_sockaddr_union*, int);
@@ -385,13 +314,4 @@
u_int res_randomid(void);
-// Symbols that are supposed to be in resolv.h, but that we aren't exporting.
-int ns_parserr2(ns_msg*, ns_sect, int, ns_rr2*);
-int ns_name_pton2(const char*, u_char*, size_t, size_t*);
-int ns_name_unpack2(const u_char*, const u_char*, const u_char*, u_char*, size_t, size_t*);
-int ns_name_eq(ns_nname_ct, size_t, ns_nname_ct, size_t);
-int ns_name_owned(ns_namemap_ct, int, ns_namemap_ct, int);
-int ns_name_map(ns_nname_ct, size_t, ns_namemap_t, int);
-int ns_name_labels(ns_nname_ct, size_t);
-
#endif /* !_RESOLV_PRIVATE_H_ */