commit d33e96d5c80460d3aac0d92acbc035183e5f9042
author Lorenzo Colitti <lorenzo@google.com> Thu Dec 15 23:59:01 2016 +0900
committer Lorenzo Colitti <lorenzo@google.com> Fri Jan 12 21:36:34 2018 +0900
tree 3437a5a8ba8e3e767aa6b6f9f2525bbd1d4ca96a
parent 23e5c7fa5677b017d2ac2ce25f897bb3788f2239

Add binder calls to manage networks, interfaces, and UID ranges.

This allows us to remove some code from the DNS test.

Bug: 30944031
Test: netd_integration_test passes
Test: netd_unit_test shows no new failures
Test: system boots, networking works
Change-Id: Ic55761a360cdccf6c4843f42716e20bcc467d25a

server/NetdNativeService.cpp

diff --git a/server/NetdNativeService.cpp b/server/NetdNativeService.cpp
index 0cb740f..1771a05 100644
--- a/server/NetdNativeService.cpp
+++ b/server/NetdNativeService.cpp
@@ -96,6 +96,14 @@
     android::RWLock::AutoWLock _lock(lock);
 
 #define NETD_BIG_LOCK_RPC(permission) NETD_LOCKING_RPC((permission), gBigNetdLock)
+
+inline binder::Status statusFromErrcode(int ret) {
+    if (ret) {
+        return binder::Status::fromServiceSpecificError(-ret, strerror(-ret));
+    }
+    return binder::Status::ok();
+}
+
 }  // namespace
 
 
@@ -154,6 +162,53 @@
     return binder::Status::ok();
 }
 
+binder::Status NetdNativeService::networkCreatePhysical(int32_t netId,
+        const std::string& permission) {
+    ENFORCE_PERMISSION(CONNECTIVITY_INTERNAL);
+    int ret = gCtls->netCtrl.createPhysicalNetwork(netId, stringToPermission(permission.c_str()));
+    return statusFromErrcode(ret);
+}
+
+binder::Status NetdNativeService::networkCreateVpn(int32_t netId, bool hasDns, bool secure) {
+    ENFORCE_PERMISSION(CONNECTIVITY_INTERNAL);
+    int ret = gCtls->netCtrl.createVirtualNetwork(netId, hasDns, secure);
+    return statusFromErrcode(ret);
+}
+
+binder::Status NetdNativeService::networkDestroy(int32_t netId) {
+    ENFORCE_PERMISSION(CONNECTIVITY_INTERNAL);
+    int ret = gCtls->netCtrl.destroyNetwork(netId);
+    return statusFromErrcode(ret);
+}
+
+binder::Status NetdNativeService::networkAddInterface(int32_t netId, const std::string& iface) {
+    ENFORCE_PERMISSION(CONNECTIVITY_INTERNAL);
+    int ret = gCtls->netCtrl.addInterfaceToNetwork(netId, iface.c_str());
+    return statusFromErrcode(ret);
+}
+
+binder::Status NetdNativeService::networkRemoveInterface(int32_t netId, const std::string& iface) {
+    ENFORCE_PERMISSION(CONNECTIVITY_INTERNAL);
+    int ret = gCtls->netCtrl.removeInterfaceFromNetwork(netId, iface.c_str());
+    return statusFromErrcode(ret);
+}
+
+binder::Status NetdNativeService::networkAddUidRanges(int32_t netId,
+        const std::vector<UidRange>& uidRangeArray) {
+    // NetworkController::addUsersToNetwork is thread-safe.
+    ENFORCE_PERMISSION(CONNECTIVITY_INTERNAL);
+    int ret = gCtls->netCtrl.addUsersToNetwork(netId, UidRanges(uidRangeArray));
+    return statusFromErrcode(ret);
+}
+
+binder::Status NetdNativeService::networkRemoveUidRanges(int32_t netId,
+        const std::vector<UidRange>& uidRangeArray) {
+    // NetworkController::removeUsersFromNetwork is thread-safe.
+    ENFORCE_PERMISSION(CONNECTIVITY_INTERNAL);
+    int ret = gCtls->netCtrl.removeUsersFromNetwork(netId, UidRanges(uidRangeArray));
+    return statusFromErrcode(ret);
+}
+
 binder::Status NetdNativeService::networkRejectNonSecureVpn(bool add,
         const std::vector<UidRange>& uidRangeArray) {
     // TODO: elsewhere RouteController is only used from the tethering and network controllers, so
@@ -172,11 +227,7 @@
         err = RouteController::removeUsersFromRejectNonSecureNetworkRule(uidRanges);
     }
 
-    if (err != 0) {
-        return binder::Status::fromServiceSpecificError(-err,
-                String8::format("RouteController error: %s", strerror(-err)));
-    }
-    return binder::Status::ok();
+    return statusFromErrcode(err);
 }
 
 binder::Status NetdNativeService::socketDestroy(const std::vector<UidRange>& uids,