commit 94658ac61e1c377251eb51f4e1c22e5140357fdb
author Luke Huang <huangluke@google.com> Thu Oct 18 19:35:12 2018 +0900
committer Luke Huang <huangluke@google.com> Thu Oct 25 13:32:55 2018 +0900
tree b0b8265a6b888a9db5f43dc63d87fe0623d06b47
parent 25b62a77695643ac232002a5a98f8f2a349bde11

Refactor UidRange by using stable aidl structure

Use stable aidl generated structure instead of UidRange

Test: built, flashed, booted
      system/netd/tests/runtests.sh passes

Change-Id: I136afcff167eac7d3c4774b9e60f607e086488bf

server/RouteController.cpp

diff --git a/server/RouteController.cpp b/server/RouteController.cpp
index 3ffe561..ad6f6a6 100644
--- a/server/RouteController.cpp
+++ b/server/RouteController.cpp
@@ -27,6 +27,8 @@
 
 #include <map>
 
+#define LOG_TAG "Netd"
+
 #include "DummyNetwork.h"
 #include "Fwmark.h"
 #include "NetdConstants.h"
@@ -35,7 +37,6 @@
 
 #include <android-base/file.h>
 #include <android-base/stringprintf.h>
-#define LOG_TAG "Netd"
 #include "log/log.h"
 #include "logwrap/logwrap.h"
 #include "netid_client.h"
@@ -43,7 +44,7 @@
 
 using android::base::StringPrintf;
 using android::base::WriteStringToFile;
-using android::net::UidRange;
+using android::net::UidRangeParcel;
 
 namespace android {
 namespace net {
@@ -766,11 +767,10 @@
     fwmark.protectedFromVpn = false;
     mask.protectedFromVpn = true;
 
-    for (const UidRange& range : uidRanges.getRanges()) {
-        if (int ret = modifyIpRule(add ? RTM_NEWRULE : RTM_DELRULE,
-                                   RULE_PRIORITY_PROHIBIT_NON_VPN, FR_ACT_PROHIBIT, RT_TABLE_UNSPEC,
-                                   fwmark.intValue, mask.intValue, IIF_LOOPBACK, OIF_NONE,
-                                   range.getStart(), range.getStop())) {
+    for (const UidRangeParcel& range : uidRanges.getRanges()) {
+        if (int ret = modifyIpRule(add ? RTM_NEWRULE : RTM_DELRULE, RULE_PRIORITY_PROHIBIT_NON_VPN,
+                                   FR_ACT_PROHIBIT, RT_TABLE_UNSPEC, fwmark.intValue, mask.intValue,
+                                   IIF_LOOPBACK, OIF_NONE, range.start, range.stop)) {
             return ret;
         }
     }
@@ -787,17 +787,16 @@
         return -ESRCH;
     }
 
-    for (const UidRange& range : uidRanges.getRanges()) {
-        if (int ret = modifyVpnUidRangeRule(table, range.getStart(), range.getStop(), secure, add))
-                {
+    for (const UidRangeParcel& range : uidRanges.getRanges()) {
+        if (int ret = modifyVpnUidRangeRule(table, range.start, range.stop, secure, add)) {
             return ret;
         }
-        if (int ret = modifyExplicitNetworkRule(netId, table, PERMISSION_NONE, range.getStart(),
-                                                range.getStop(), add)) {
+        if (int ret = modifyExplicitNetworkRule(netId, table, PERMISSION_NONE, range.start,
+                                                range.stop, add)) {
             return ret;
         }
-        if (int ret = modifyOutputInterfaceRules(interface, table, PERMISSION_NONE,
-                                                 range.getStart(), range.getStop(), add)) {
+        if (int ret = modifyOutputInterfaceRules(interface, table, PERMISSION_NONE, range.start,
+                                                 range.stop, add)) {
             return ret;
         }
     }