commit d2617936acc15567fc5111bbdb4dde20845c3cba
author Chad Brubaker <cbrubaker@google.com> Fri Jun 21 15:26:35 2013 -0700
committer Chad Brubaker <cbrubaker@google.com> Wed Jun 26 15:21:46 2013 -0700
tree 454bfd4fc71de51022ea364d6c5ee3d7a68b9a70
parent eb648acc30c3b04823c8ee533b12ae56d772ce47

Add netd support for uid based routing for DNS

DNSProxyListener now supports bionic changes for marking DNS requests
for routing DNS requests with the uid routing rules

Change-Id: Iac9aa1bb14834be6da5e512405f23c6a72dc71ed

main.cpp

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