commit 4043f01f8e25f24246efadc710ad7440aab75529
author Sreeram Ramachandran <sreeram@google.com> Mon Jun 23 12:41:37 2014 -0700
committer Sreeram Ramachandran <sreeram@google.com> Tue Jul 01 10:59:47 2014 -0700
tree 05690f59e4158475a99fe9220191c3282c9f0981
parent f4f6c8de3f091be4b91a5a9d7f14e8882ec6d502

Introduce VPN support.

This change sets up the basic routing rules for VPNs. It doesn't yet handle UID
ranges (that are meant to apply to the VPN) correctly. That's forthcoming in
other CLs.

Bug: 15409918
Change-Id: I284de04f176dcf6ba702361de6a614266256d04e

server/NetworkController.cpp

diff --git a/server/NetworkController.cpp b/server/NetworkController.cpp
index be28c5b..8a51bcb 100644
--- a/server/NetworkController.cpp
+++ b/server/NetworkController.cpp
@@ -34,6 +34,7 @@
 
 #include "PhysicalNetwork.h"
 #include "RouteController.h"
+#include "VirtualNetwork.h"
 
 #define LOG_TAG "Netd"
 #include "log/log.h"
@@ -145,6 +146,11 @@
             return entry.first;
         }
     }
+    for (const auto& entry : mVirtualNetworks) {
+        if (entry.second->hasInterface(interface)) {
+            return entry.first;
+        }
+    }
     return NETID_UNSET;
 }
 
@@ -176,6 +182,22 @@
     return 0;
 }
 
+int NetworkController::createVpn(unsigned netId, uid_t ownerUid) {
+    if (netId < MIN_NET_ID || netId > MAX_NET_ID) {
+        ALOGE("invalid netId %u", netId);
+        return -EINVAL;
+    }
+
+    if (isValidNetwork(netId)) {
+        ALOGE("duplicate netId %u", netId);
+        return -EEXIST;
+    }
+
+    android::RWLock::AutoWLock lock(mRWLock);
+    mVirtualNetworks[netId] = new VirtualNetwork(netId, ownerUid);
+    return 0;
+}
+
 int NetworkController::destroyNetwork(unsigned netId) {
     if (!isValidNetwork(netId)) {
         ALOGE("invalid netId %u", netId);
@@ -198,6 +220,7 @@
         mDefaultNetId = NETID_UNSET;
     }
     mPhysicalNetworks.erase(netId);
+    mVirtualNetworks.erase(netId);
     delete network;
     _resolv_delete_cache_for_net(netId);
     return 0;
@@ -247,6 +270,7 @@
     }
 }
 
+// TODO: Handle VPNs.
 bool NetworkController::isUserPermittedOnNetwork(uid_t uid, unsigned netId) const {
     android::RWLock::AutoRLock lock(mRWLock);
     auto userIter = mUsers.find(uid);
@@ -293,6 +317,12 @@
     if (physicalNetworkIter != mPhysicalNetworks.end()) {
         return physicalNetworkIter->second;
     }
+    {
+        auto iter = mVirtualNetworks.find(netId);
+        if (iter != mVirtualNetworks.end()) {
+            return iter->second;
+        }
+    }
     return NULL;
 }