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.h

diff --git a/server/NetdNativeService.h b/server/NetdNativeService.h
index 6842f1a..35f4038 100644
--- a/server/NetdNativeService.h
+++ b/server/NetdNativeService.h
@@ -34,14 +34,36 @@
     virtual status_t dump(int fd, const Vector<String16> &args) override;
 
     binder::Status isAlive(bool *alive) override;
+
+    // Firewall commands.
     binder::Status firewallReplaceUidChain(
             const String16& chainName, bool isWhitelist,
             const std::vector<int32_t>& uids, bool *ret) override;
+
+    // Bandwidth control commands.
     binder::Status bandwidthEnableDataSaver(bool enable, bool *ret) override;
+
+    // Network and routing commands.
+    binder::Status networkCreatePhysical(int32_t netId, const std::string& permission)
+            override;
+    binder::Status networkCreateVpn(int32_t netId, bool hasDns, bool secure) override;
+    binder::Status networkDestroy(int32_t netId) override;
+
+    binder::Status networkAddInterface(int32_t netId, const std::string& iface) override;
+    binder::Status networkRemoveInterface(int32_t netId, const std::string& iface) override;
+
+    binder::Status networkAddUidRanges(int32_t netId, const std::vector<UidRange>& uids)
+            override;
+    binder::Status networkRemoveUidRanges(int32_t netId, const std::vector<UidRange>& uids)
+            override;
     binder::Status networkRejectNonSecureVpn(bool enable, const std::vector<UidRange>& uids)
             override;
+
+    // SOCK_DIAG commands.
     binder::Status socketDestroy(const std::vector<UidRange>& uids,
             const std::vector<int32_t>& skipUids) override;
+
+    // Resolver commands.
     binder::Status setResolverConfiguration(int32_t netId, const std::vector<std::string>& servers,
             const std::vector<std::string>& domains, const std::vector<int32_t>& params,
             bool useTls, const std::string& tlsName,
@@ -63,6 +85,7 @@
     binder::Status tetherApplyDnsInterfaces(bool *ret) override;
     binder::Status tetherGetStats(android::os::PersistableBundle *ret) override;
 
+    // Interface-related commands.
     binder::Status interfaceAddAddress(const std::string &ifName,
             const std::string &addrString, int prefixLength) override;
     binder::Status interfaceDelAddress(const std::string &ifName,