commit c5d802e248eb28108b16ae581ffb03b903cf812f
author Treehugger Robot <treehugger-gerrit@google.com> Sun May 28 11:06:16 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun May 28 11:06:18 2017 +0000
tree ea135c99cd37d7d7ff7d53363813150d86817a74
parent 98d8c08b8c55748735c2ff8ccbf7ad01a8f6e882
parent 6d4669fa924315139f3636368c6623209fbfc3ea

Merge "Only set protectFromVpn if explicitlySelected is also true."

server/NetworkController.cpp

diff --git a/server/NetworkController.cpp b/server/NetworkController.cpp
index 8e4c69d..b90976b 100644
--- a/server/NetworkController.cpp
+++ b/server/NetworkController.cpp
@@ -47,6 +47,8 @@
 #include "RouteController.h"
 #include "VirtualNetwork.h"
 
+#define DBG 0
+
 namespace android {
 namespace net {
 
@@ -287,12 +289,17 @@
     Fwmark fwmark;
     fwmark.netId = nc.app_netid;
     fwmark.explicitlySelected = explicitlySelected;
-    fwmark.protectedFromVpn = canProtect(uid);
+    fwmark.protectedFromVpn = explicitlySelected && canProtect(uid);
     fwmark.permission = getPermissionForUser(uid);
     nc.app_mark = fwmark.intValue;
 
     nc.dns_mark = getNetworkForDns(&(nc.dns_netid), uid);
 
+    if (DBG) {
+        ALOGD("app_netid:0x%x app_mark:0x%x dns_netid:0x%x dns_mark:0x%x uid:%d",
+              nc.app_netid, nc.app_mark, nc.dns_netid, nc.dns_mark, uid);
+    }
+
     if (netcontext) {
         *netcontext = nc;
     }

server/NetworkController.h

diff --git a/server/NetworkController.h b/server/NetworkController.h
index 0c6cd63..d5451ee 100644
--- a/server/NetworkController.h
+++ b/server/NetworkController.h
@@ -118,7 +118,6 @@
     std::map<unsigned, Network*> mNetworks;  // Map keys are NetIds.
     std::map<uid_t, Permission> mUsers;
     std::set<uid_t> mProtectableUsers;
-
 };
 
 }  // namespace net