Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29efcd19 authored by Bernie Innocenti's avatar Bernie Innocenti
Browse files

Cleanup the libnetd_resolv exports 

After moving DnsProxyListener into libnetd_resolv, gethostbyname and
gethostbyaddr no longer need to be publicly accessible.

However, netd is still calling android_getaddrinfofornetcontext()
directly. It should instead call android_getaddrinfofornetwork() from
multinetwork.h and go through the dnsproxyd socket, like it already
does for getaddrinfo().

Test: atest resolv_integration_test resolv_unit_test
Change-Id: I24d974df1096d1bd8a0c047341a260dbc5575aa4
parent 9a4e6dd6

include/netd_resolv/resolv_stub.h

+0 −9
Original line number Diff line number Diff line
@@ -37,12 +37,6 @@ extern struct ResolvStub { 
    int (*android_getaddrinfofornetcontext)(const char*, const char*, const addrinfo*,

                                            const android_net_context*, addrinfo**);



    int (*android_gethostbyaddrfornetcontext)(const void*, socklen_t, int,

                                              const android_net_context*, hostent**);



    int (*android_gethostbynamefornetcontext)(const char*, int, const android_net_context*,

                                              hostent**);



    void (*android_net_res_stats_aggregate)(res_stats* stats, int* successes, int* errors,

                                            int* timeouts, int* internal_errors, int* rtt_avg,

                                            time_t* last_sample_time);
@@ -68,9 +62,6 @@ extern struct ResolvStub { 


    void (*resolv_register_private_dns_callback)(private_dns_validated_callback callback);



    int (*resolv_res_nsend)(const android_net_context* netContext, const u_char* msg, int msgLen,

                            u_char* ans, int ansLen, int* rcode, uint32_t flags);



    int (*resolv_set_nameservers_for_net)(unsigned netid, const char** servers, unsigned numservers,

                                          const char* domains, const __res_params* params);

libnetd_resolv.map.txt

+0 −3
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
LIBNETD_RESOLV {

  global:

    android_getaddrinfofornetcontext;

    android_gethostbyaddrfornetcontext;

    android_gethostbynamefornetcontext;

    android_net_res_stats_aggregate;

    android_net_res_stats_get_info_for_net;

    android_net_res_stats_get_usable_servers;
@@ -32,7 +30,6 @@ LIBNETD_RESOLV { 
    resolv_has_nameservers;

    resolv_init;

    resolv_register_private_dns_callback;

    resolv_res_nsend;

    resolv_set_nameservers_for_net;

    resolv_set_private_dns_for_net;

  local: