diff options
author | Sreeram Ramachandran <sreeram@google.com> | 2014-07-28 18:53:50 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-27 22:35:46 +0000 |
commit | 060d855a00cb94e8903fd1551c9bf040f42b57d1 (patch) | |
tree | fbc4f9dea7c4432490627b77974be889ad2ea94e /server/NetworkController.h | |
parent | 507e7c5bbfcd1d68f67477866497adb1748c5fd5 (diff) | |
parent | de5d5df753dd35d852ac47a6174b06eacd0d5523 (diff) | |
download | netd-060d855a00cb94e8903fd1551c9bf040f42b57d1.tar.gz |
Merge "Prohibit address families by default unless a VPN explicitly allows them." into lmp-dev
Diffstat (limited to 'server/NetworkController.h')
-rw-r--r-- | server/NetworkController.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/server/NetworkController.h b/server/NetworkController.h index 104f98cc..fca4125e 100644 --- a/server/NetworkController.h +++ b/server/NetworkController.h @@ -72,6 +72,9 @@ public: int addUsersToNetwork(unsigned netId, const UidRanges& uidRanges) WARN_UNUSED_RESULT; int removeUsersFromNetwork(unsigned netId, const UidRanges& uidRanges) WARN_UNUSED_RESULT; + // |nexthop| can be NULL (to indicate a directly-connected route), "unreachable" (to indicate a + // route that's blocked) or a regular IP address. + // // Routes are added to tables determined by the interface, so only |interface| is actually used. // |netId| is given only to sanity check that the interface has the correct netId. int addRoute(unsigned netId, const char* interface, const char* destination, |