generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tracking change to dns proxy protocol

Browse Source 
The gethostbyaddr code in system/netd now expects a string address
from inet_ntop, not raw bytes, in order to properly pass addresses
containing null and probably spaces and newlines characeters as well.

Bug: 4344448
git cherry-pick -e c13fa640eea3285a586fc4bad0abf2fc1b902185
This commit is contained in:
Brian Carlstrom 2011-04-27 11:55:43 -07:00
parent 2dc801f9fc
commit c5a3f7700b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libc/netbsd/net/getnameinfo.c
View File

@ -135,7 +135,7 @@ int getnameinfo(const struct sockaddr* sa, socklen_t salen, char* host, size_t h
* the address. On failure -1 is returned in which case * the address. On failure -1 is returned in which case
* normal execution flow shall continue. */ * normal execution flow shall continue. */
static int static int
android_gethostbyaddr_proxy(struct hostent* hp, const char *addr, socklen_t addrLen, int addrFamily) { android_gethostbyaddr_proxy(struct hostent* hp, const void *addr, socklen_t addrLen, int addrFamily) {
int sock; int sock;
const int one = 1; const int one = 1;
@ -170,7 +170,7 @@ android_gethostbyaddr_proxy(struct hostent* hp, const char *addr, socklen_t addr
proxy_addr.sun_family = AF_UNIX; proxy_addr.sun_family = AF_UNIX;
strlcpy(proxy_addr.sun_path, "/dev/socket/dnsproxyd", strlcpy(proxy_addr.sun_path, "/dev/socket/dnsproxyd",
sizeof(proxy_addr.sun_path)); sizeof(proxy_addr.sun_path));
if (TEMP_FAILURE_RETRY(connect(sock, (const struct sockaddr*) &proxy_addr, if (TEMP_FAILURE_RETRY(connect(sock, (const struct sockaddr*) (void*) &proxy_addr,
sizeof(proxy_addr))) != 0) { sizeof(proxy_addr))) != 0) {
close(sock); close(sock);
return -1; return -1;
@ -182,7 +182,12 @@ android_gethostbyaddr_proxy(struct hostent* hp, const char *addr, socklen_t addr
goto exit; goto exit;
} }
if (fprintf(proxy, "gethostbyaddr %s %d %d", addr, addrLen, addrFamily) < 0) { char buf[INET6_ADDRSTRLEN]; // big enough for IPv4 and IPv6
const char* addrStr = inet_ntop(addrFamily, addr, &buf, sizeof(buf));
if (addrStr == NULL) {
goto exit;
}
if (fprintf(proxy, "gethostbyaddr %s %d %d", addrStr, addrLen, addrFamily) < 0) {
goto exit; goto exit;
} }