commit ed4bd1f7d219f9f5f56763ea02cf4947e78397f6
author Sreeram Ramachandran <sreeram@google.com> Sat Jul 05 12:31:05 2014 -0700
committer Sreeram Ramachandran <sreeram@google.com> Mon Jul 07 13:16:02 2014 -0700
tree f1ec6176a56c340fd4207058c1b4558ed4b15354
parent a675b00423e5a370e72a7f10f6b632b4d15a1ff4

Fix permissions handling.

+ Rename the permissions as per: http://go/android-multinetwork-routing
+ Make the SYSTEM permission explicitly include NETWORK.
+ Grant the SYSTEM permission to system UIDs by default, but allow the framework
  to override them if necessary.
+ Move the "string to permission" parsing to CommandListener.cpp, thus allowing
  us to get rid of Permission.cpp.
+ There's no need to support multiple permissions string arguments, so tighten
  that up.

Change-Id: I73d51b5e2f44a97e6d5ab5943ff198cebfbcc0c4

server/ClatdController.cpp

diff --git a/server/ClatdController.cpp b/server/ClatdController.cpp
index 4114de1..ca6908c 100644
--- a/server/ClatdController.cpp
+++ b/server/ClatdController.cpp
@@ -61,7 +61,7 @@
         char netIdString[UINT32_STRLEN];
         snprintf(netIdString, sizeof(netIdString), "%u", netId);
 
-        Fwmark fwmark = { netId, true, true, PERMISSION_CONNECTIVITY_INTERNAL };
+        Fwmark fwmark = {netId, true, true, PERMISSION_SYSTEM};
         char fwmarkString[UINT32_HEX_STRLEN];
         snprintf(fwmarkString, sizeof(fwmarkString), "0x%x", fwmark.intValue);