am 172ab0f6
: Merge "Query libnetd_client for the appropriate netId for host resolution."
* commit '172ab0f65035013565ec57f52ece663082683698': Query libnetd_client for the appropriate netId for host resolution.
This commit is contained in:
commit
1c99b23cc1
libc
@ -43,6 +43,8 @@ static void netdClientInitImpl() {
|
||||
netdClientInitFunction(netdClientHandle, "netdClientInitAccept", &__netdClientDispatch.accept);
|
||||
netdClientInitFunction(netdClientHandle, "netdClientInitConnect",
|
||||
&__netdClientDispatch.connect);
|
||||
netdClientInitFunction(netdClientHandle, "netdClientInitNetIdForResolv",
|
||||
&__netdClientDispatch.netIdForResolv);
|
||||
}
|
||||
|
||||
static pthread_once_t netdClientInitOnce = PTHREAD_ONCE_INIT;
|
||||
|
@ -25,9 +25,14 @@
|
||||
extern "C" __socketcall int __accept(int, sockaddr*, socklen_t*);
|
||||
extern "C" __socketcall int __connect(int, const sockaddr*, socklen_t);
|
||||
|
||||
static unsigned fallBackNetIdForResolv(unsigned netId) {
|
||||
return netId;
|
||||
}
|
||||
|
||||
// This structure is modified only at startup (when libc.so is loaded) and never
|
||||
// afterwards, so it's okay that it's read later at runtime without a lock.
|
||||
__LIBC_HIDDEN__ NetdClientDispatch __netdClientDispatch __attribute__((aligned(32))) = {
|
||||
__accept,
|
||||
__connect,
|
||||
fallBackNetIdForResolv,
|
||||
};
|
||||
|
@ -60,6 +60,7 @@
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <arpa/nameser.h>
|
||||
#include "NetdClientDispatch.h"
|
||||
#include "resolv_netid.h"
|
||||
#include "resolv_private.h"
|
||||
#include "resolv_cache.h"
|
||||
@ -760,6 +761,8 @@ gethostbyname_internal(const char *name, int af, res_state res, unsigned netid,
|
||||
proxy = android_open_proxy();
|
||||
if (proxy == NULL) goto exit;
|
||||
|
||||
netid = __netdClientDispatch.netIdForResolv(netid);
|
||||
|
||||
/* This is writing to system/netd/DnsProxyListener.cpp and changes
|
||||
* here need to be matched there */
|
||||
if (fprintf(proxy, "gethostbyname %u %s %d",
|
||||
@ -796,6 +799,8 @@ android_gethostbyaddrfornet_proxy(const void *addr,
|
||||
const char * addrStr = inet_ntop(af, addr, buf, sizeof(buf));
|
||||
if (addrStr == NULL) goto exit;
|
||||
|
||||
netid = __netdClientDispatch.netIdForResolv(netid);
|
||||
|
||||
if (fprintf(proxy, "gethostbyaddr %s %d %d %u",
|
||||
addrStr, len, af, netid) < 0) {
|
||||
goto exit;
|
||||
|
@ -92,6 +92,7 @@
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <netdb.h>
|
||||
#include "NetdClientDispatch.h"
|
||||
#include "resolv_cache.h"
|
||||
#include "resolv_netid.h"
|
||||
#include "resolv_private.h"
|
||||
@ -449,6 +450,8 @@ android_getaddrinfo_proxy(
|
||||
return EAI_NODATA;
|
||||
}
|
||||
|
||||
netid = __netdClientDispatch.netIdForResolv(netid);
|
||||
|
||||
// Send the request.
|
||||
proxy = fdopen(sock, "r+");
|
||||
if (fprintf(proxy, "getaddrinfo %s %s %d %d %d %d %u",
|
||||
|
@ -25,6 +25,7 @@ __BEGIN_DECLS
|
||||
struct NetdClientDispatch {
|
||||
int (*accept)(int, struct sockaddr*, socklen_t*);
|
||||
int (*connect)(int, const struct sockaddr*, socklen_t);
|
||||
unsigned (*netIdForResolv)(unsigned);
|
||||
};
|
||||
|
||||
extern __LIBC_HIDDEN__ struct NetdClientDispatch __netdClientDispatch;
|
||||
|
Loading…
Reference in New Issue
Block a user