summaryrefslogtreecommitdiff
path: root/server/RouteController.cpp
diff options
context:
space:
mode:
authorSreeram Ramachandran <sreeram@google.com>2014-07-05 17:15:14 -0700
committerSreeram Ramachandran <sreeram@google.com>2014-07-07 16:20:18 -0700
commite09b20aee85f1dfd8c18c3d8581ac875d939ba70 (patch)
treebdfbd786a1cc3069ffa8b5d7513ccb6a115b72e1 /server/RouteController.cpp
parent5009d5ef3fbcdc69d772b528fd22184b7d605afa (diff)
Add full support for UIDs in VPNs.
Major: + Implement the functions mentioned in http://go/android-multinetwork-routing correctly, including handling accept(), connect(), setNetworkForSocket() and protect() and supporting functions like canUserSelectNetwork(). + Eliminate the old code path of getting/setting UID ranges through SecondaryTableController (which is currently unused) and mUidMap. Minor: + Rename some methods/variables for clarity and consistency. + Moved some methods in .cpp files to match declaration order in the .h files. Bug: 15409918 Change-Id: Ic6ce3646c58cf645db0d9a53cbeefdd7ffafff93
Diffstat (limited to 'server/RouteController.cpp')
-rw-r--r--server/RouteController.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/RouteController.cpp b/server/RouteController.cpp
index d090bef4..bc50dc41 100644
--- a/server/RouteController.cpp
+++ b/server/RouteController.cpp
@@ -524,7 +524,7 @@ WARN_UNUSED_RESULT int modifyVirtualNetwork(unsigned netId, const char* interfac
return -ESRCH;
}
- for (const std::pair<uid_t, uid_t>& range : uidRanges.getRanges()) {
+ for (const UidRanges::Range& range : uidRanges.getRanges()) {
if (int ret = modifyExplicitNetworkRule(netId, table, PERMISSION_NONE, range.first,
range.second, add)) {
return ret;