From 95f421024a3b3c94a71c5328e23bf5456e7f14ba Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Wed, 29 Oct 2014 13:57:37 -0700 Subject: Code cleanup, and fix some unsafe pointer handling in Network. --- node/NodeConfig.hpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'node/NodeConfig.hpp') diff --git a/node/NodeConfig.hpp b/node/NodeConfig.hpp index e858d6f7..498d43db 100644 --- a/node/NodeConfig.hpp +++ b/node/NodeConfig.hpp @@ -145,7 +145,7 @@ public: inline bool hasNetwork(uint64_t nwid) { Mutex::Lock _l(_networks_m); - return (_networks.count(nwid) > 0); + return (_networks.find(nwid) != _networks.end()); } /** @@ -163,12 +163,15 @@ public: return tapDevs; } +private: void _readLocalConfig(); void _writeLocalConfig(); const RuntimeEnvironment *RR; + Dictionary _localConfig; // persisted as local.conf Mutex _localConfig_m; + std::map< uint64_t,SharedPtr > _networks; // persisted in networks.d/ Mutex _networks_m; }; -- cgit v1.2.3