X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=server%2FRouteController.h;h=0694ea2565cc227148e9511380e6654fa74c7aa2;hb=13fa01fab904679970e4b95357f8eed7327b6d49;hp=33db69f4125ad659319c3bc855fcb00a2c8cc1c7;hpb=eb27b7ec10faf47a93fbc2863092cc667b05e252;p=android-x86%2Fsystem-netd.git

diff --git a/server/RouteController.h b/server/RouteController.h
index 33db69f..0694ea2 100644
--- a/server/RouteController.h
+++ b/server/RouteController.h
@@ -28,44 +28,60 @@ class RouteController {
 public:
     // How the routing table number is determined for route modification requests.
     enum TableType {
-        INTERFACE,  // Compute the table number based on the interface index.
-        LEGACY,  // Use a fixed table that's used to override the default network.
-        PRIVILEGED_LEGACY,  // A fixed table, only modifiable by privileged apps; overrides VPNs.
+        INTERFACE,       // Compute the table number based on the interface index.
+        LOCAL_NETWORK,   // A fixed table used for routes to directly-connected clients/peers.
+        LEGACY_NETWORK,  // Use a fixed table that's used to override the default network.
+        LEGACY_SYSTEM,   // A fixed table, only modifiable by system apps; overrides VPNs too.
     };
 
-    static const int ROUTE_TABLE_LEGACY            =   98;
-    static const int ROUTE_TABLE_PRIVILEGED_LEGACY =   99;
     static const int ROUTE_TABLE_OFFSET_FROM_INDEX = 1000;
 
-    static int Init() WARN_UNUSED_RESULT;
+    static int Init(unsigned localNetId) WARN_UNUSED_RESULT;
 
-    static int addInterfaceToNetwork(unsigned netId, const char* interface,
-                                     Permission permission) WARN_UNUSED_RESULT;
-    static int removeInterfaceFromNetwork(unsigned netId, const char* interface,
-                                          Permission permission) WARN_UNUSED_RESULT;
+    static int addInterfaceToLocalNetwork(unsigned netId, const char* interface) WARN_UNUSED_RESULT;
+    static int removeInterfaceFromLocalNetwork(unsigned netId,
+                                               const char* interface) WARN_UNUSED_RESULT;
 
-    static int addInterfaceToVpn(unsigned netId, const char* interface,
-                                 const UidRanges& uidRanges) WARN_UNUSED_RESULT;
-    static int removeInterfaceFromVpn(unsigned netId, const char* interface,
-                                      const UidRanges& uidRanges) WARN_UNUSED_RESULT;
+    static int addInterfaceToPhysicalNetwork(unsigned netId, const char* interface,
+                                             Permission permission) WARN_UNUSED_RESULT;
+    static int removeInterfaceFromPhysicalNetwork(unsigned netId, const char* interface,
+                                                  Permission permission) WARN_UNUSED_RESULT;
 
-    static int modifyNetworkPermission(unsigned netId, const char* interface,
-                                       Permission oldPermission,
-                                       Permission newPermission) WARN_UNUSED_RESULT;
+    static int addInterfaceToVirtualNetwork(unsigned netId, const char* interface, bool secure,
+                                            const UidRanges& uidRanges) WARN_UNUSED_RESULT;
+    static int removeInterfaceFromVirtualNetwork(unsigned netId, const char* interface, bool secure,
+                                                 const UidRanges& uidRanges) WARN_UNUSED_RESULT;
 
-    static int addToDefaultNetwork(const char* interface, Permission permission) WARN_UNUSED_RESULT;
-    static int removeFromDefaultNetwork(const char* interface,
-                                        Permission permission) WARN_UNUSED_RESULT;
+    static int modifyPhysicalNetworkPermission(unsigned netId, const char* interface,
+                                               Permission oldPermission,
+                                               Permission newPermission) WARN_UNUSED_RESULT;
 
-    static int addUsersToVpn(unsigned netId, const char* interface,
-                             const UidRanges& uidRanges) WARN_UNUSED_RESULT;
-    static int removeUsersFromVpn(unsigned netId, const char* interface,
-                                  const UidRanges& uidRanges) WARN_UNUSED_RESULT;
+    static int addUsersToVirtualNetwork(unsigned netId, const char* interface, bool secure,
+                                        const UidRanges& uidRanges) WARN_UNUSED_RESULT;
+    static int removeUsersFromVirtualNetwork(unsigned netId, const char* interface, bool secure,
+                                             const UidRanges& uidRanges) WARN_UNUSED_RESULT;
 
+    static int addInterfaceToDefaultNetwork(const char* interface,
+                                            Permission permission) WARN_UNUSED_RESULT;
+    static int removeInterfaceFromDefaultNetwork(const char* interface,
+                                                 Permission permission) WARN_UNUSED_RESULT;
+
+    // |nexthop| can be NULL (to indicate a directly-connected route), "unreachable" (to indicate a
+    // route that's blocked), "throw" (to indicate the lack of a match), or a regular IP address.
     static int addRoute(const char* interface, const char* destination, const char* nexthop,
                         TableType tableType) WARN_UNUSED_RESULT;
     static int removeRoute(const char* interface, const char* destination, const char* nexthop,
                            TableType tableType) WARN_UNUSED_RESULT;
+
+    static int enableTethering(const char* inputInterface,
+                               const char* outputInterface) WARN_UNUSED_RESULT;
+    static int disableTethering(const char* inputInterface,
+                                const char* outputInterface) WARN_UNUSED_RESULT;
+
+    static int addVirtualNetworkFallthrough(unsigned vpnNetId, const char* physicalInterface,
+                                            Permission permission) WARN_UNUSED_RESULT;
+    static int removeVirtualNetworkFallthrough(unsigned vpnNetId, const char* physicalInterface,
+                                               Permission permission) WARN_UNUSED_RESULT;
 };
 
 #endif  // NETD_SERVER_ROUTE_CONTROLLER_H