commit a0efaece8c05370f201efe099a537ceb014c6fdf
author Szymon Jakubczak <szym@google.com> Fri Feb 14 17:09:43 2014 -0500
committer Paul Jensen <pauljensen@google.com> Thu Mar 27 15:36:40 2014 -0400
tree d10f844e77e38535b167910578db5293089b109f
parent 57abed1d8463b20a28745894d99942bfa9512e1b

netd: Replace iface with opaque netid in resolver.

Also ensure that UID mapping (for VPN) cannot be overridden by
android_getaddrinfofornet or per-PID preference.

Change-Id: I9ccfda2902cc0943e87c9bc346ad9a2578accdab

main.cpp

diff --git a/main.cpp b/main.cpp
index 104ebe1..3a356d4 100644
--- a/main.cpp
+++ b/main.cpp
@@ -34,7 +34,6 @@
 #include "NetlinkManager.h"
 #include "DnsProxyListener.h"
 #include "MDnsSdListener.h"
-#include "UidMarkMap.h"
 
 static void coldboot(const char *path);
 static void sigchld_handler(int sig);
@@ -57,9 +56,7 @@
         exit(1);
     };
 
-    UidMarkMap *rangeMap = new UidMarkMap();
-
-    cl = new CommandListener(rangeMap);
+    cl = new CommandListener();
     nm->setBroadcaster((SocketListener *) cl);
 
     if (nm->start()) {
@@ -70,7 +67,7 @@
     // Set local DNS mode, to prevent bionic from proxying
     // back to this service, recursively.
     setenv("ANDROID_DNS_MODE", "local", 1);
-    dpl = new DnsProxyListener(rangeMap);
+    dpl = new DnsProxyListener(CommandListener::sNetCtrl);
     if (dpl->startListener()) {
         ALOGE("Unable to start DnsProxyListener (%s)", strerror(errno));
         exit(1);