From 555e02dee7e46831eaeb7ff2c90f49b6943bb157 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Thu, 28 Oct 2010 13:22:20 -0700 Subject: [PATCH] Don't proxy getaddrinfo when net.dns1.[MYPID] is set. Part of on-going DNS proxy/cache work. Bug: 1146676 Change-Id: I5e6028169c81c2223efc34c3b57e348c44f26d26 --- libc/netbsd/net/getaddrinfo.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libc/netbsd/net/getaddrinfo.c b/libc/netbsd/net/getaddrinfo.c index 4fa92b74b..451065246 100644 --- a/libc/netbsd/net/getaddrinfo.c +++ b/libc/netbsd/net/getaddrinfo.c @@ -103,6 +103,10 @@ #include #include "nsswitch.h" +#ifdef ANDROID_CHANGES +#include +#endif /* ANDROID_CHANGES */ + typedef union sockaddr_union { struct sockaddr generic; struct sockaddr_in in; @@ -399,6 +403,16 @@ android_getaddrinfo_proxy( return -1; } + // Temporary cautious hack to disable the DNS proxy for processes + // requesting special treatment. Ideally the DNS proxy should + // accomodate these apps, though. + char propname[PROP_NAME_MAX]; + char propvalue[PROP_VALUE_MAX]; + snprintf(propname, sizeof(propname), "net.dns1.%d", getpid()); + if (__system_property_get(propname, propvalue) > 0) { + return -1; + } + // Bogus things we can't serialize. Don't use the proxy. if ((hostname != NULL && strcspn(hostname, " \n\r\t^'\"") != strlen(hostname)) ||