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

Commit 53614144 authored by Bernie Innocenti's avatar Bernie Innocenti Committed by android-build-merger
Browse files

Merge "Hide sockaddr_union from libnetd_resolv's public headers" am: 5cd1106a2e 

am: f6fd0b7750

Change-Id: Iffe2fecb1fbd4f2f71fbf972343e00b661d05d21
parents ca2643b8 ef1fcb6f

include/netd_resolv/resolv.h

+0 −6
Original line number Diff line number Diff line
@@ -32,12 +32,6 @@ 


#include <netinet/in.h>



typedef union sockaddr_union {

    struct sockaddr sa;

    struct sockaddr_in sin;

    struct sockaddr_in6 sin6;

} sockaddr_union;



/*

 * Passing NETID_UNSET as the netId causes system/netd/resolv/DnsProxyListener.cpp to

 * fill in the appropriate default netId for the query.

resolv_private.h

+7 −0
Original line number Diff line number Diff line
@@ -122,6 +122,13 @@ struct __res_state { 


typedef struct __res_state* res_state;



// Holds either a sockaddr_in or a sockaddr_in6.

typedef union sockaddr_union {

    struct sockaddr sa;

    struct sockaddr_in sin;

    struct sockaddr_in6 sin6;

} sockaddr_union;



/* Retrieve a local copy of the stats for the given netid. The buffer must have space for

 * MAXNS __resolver_stats. Returns the revision id of the resolvers used.

 */