commit 107075a48973c18a087a5cb2ad2ad43e73f9909a
author Lorenzo Colitti <lorenzo@google.com> Mon Oct 30 19:24:46 2017 +0900
committer Lorenzo Colitti <lorenzo@google.com> Fri Nov 24 17:01:50 2017 +0900
tree 0c323a718c937dea999dea0b932d2d44296171c8
parent 02cb80a71afbbe89e3ced8b417b2abe7578dbc82

Add locking to RouteController.

Test: netd_{unit,integration}_test passes
Change-Id: I12899e0304d266b25b0b021ae28f9073c8b42604

server/RouteController.h

diff --git a/server/RouteController.h b/server/RouteController.h
index b01e283..de79b61 100644
--- a/server/RouteController.h
+++ b/server/RouteController.h
@@ -102,11 +102,14 @@
 private:
     friend class RouteControllerTest;
 
+    // Protects access to interfaceToTable.
+    static android::RWLock sInterfaceToTableLock;
     static std::map<std::string, uint32_t> sInterfaceToTable;
 
     static int configureDummyNetwork();
     static int flushRoutes(const char* interface);
     static int flushRoutes(uint32_t table);
+    static uint32_t getRouteTableForInterfaceLocked(const char *interface);
     static uint32_t getRouteTableForInterface(const char *interface);
     static int modifyDefaultNetwork(uint16_t action, const char* interface, Permission permission);
     static int modifyPhysicalNetwork(unsigned netId, const char* interface, Permission permission,