commit ae37e8a4f42b658d5aaf43f312f063944b4aeecb
author Paul Jensen <pauljensen@google.com> Mon Apr 28 10:35:51 2014 -0400
committer Lorenzo Colitti <lorenzo@google.com> Wed May 14 02:46:17 2014 -0700
tree 37b5a4bc8de51b288569e78fc39ad07013d90975
parent fd6424fdf2cd0516a6c95288610e323dbdfe84ff

Separate network and interface addition/removal netd APIs.
This should facilitate stacked interfaces (i.e. clatd).

Change-Id: Ib3e7a4d3847ef6ec4449451f6da42e75959baa4f

NetworkController.h

diff --git a/NetworkController.h b/NetworkController.h
index f1c8fda..fff3289 100644
--- a/NetworkController.h
+++ b/NetworkController.h
@@ -58,8 +58,10 @@
 
     unsigned getNetworkId(const char* interface);
 
-    bool createNetwork(unsigned netId, const char* interface, Permission permission);
+    bool createNetwork(unsigned netId, Permission permission);
     bool destroyNetwork(unsigned netId);
+    bool addInterfaceToNetwork(unsigned netId, const char* interface);
+    bool removeInterfaceFromNetwork(unsigned netId, const char* interface);
 
     bool setPermissionForUser(Permission permission, const std::vector<unsigned>& uid);
     bool setPermissionForNetwork(Permission permission, const std::vector<unsigned>& netId);
@@ -72,7 +74,7 @@
                      const char* nexthop);
 
 private:
-    typedef std::multimap<unsigned, std::string>::const_iterator InterfaceIterator;
+    typedef std::multimap<unsigned, std::string>::iterator InterfaceIterator;
     typedef std::pair<InterfaceIterator, InterfaceIterator> InterfaceRange;
 
     // Returns the netId that |interface| belongs to, or NETID_UNSET if it doesn't belong to any.