diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-10-29 13:57:37 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-10-29 13:57:37 -0700 |
| commit | 95f421024a3b3c94a71c5328e23bf5456e7f14ba (patch) | |
| tree | b5d908204e87944823a436eaec000b75be609717 /node/NodeConfig.hpp | |
| parent | f65b48d447e414e3cdc1e6787cf92a795a11956b (diff) | |
| download | infinitytier-95f421024a3b3c94a71c5328e23bf5456e7f14ba.tar.gz infinitytier-95f421024a3b3c94a71c5328e23bf5456e7f14ba.zip | |
Code cleanup, and fix some unsafe pointer handling in Network.
Diffstat (limited to 'node/NodeConfig.hpp')
| -rw-r--r-- | node/NodeConfig.hpp | 5 |
1 files changed, 4 insertions, 1 deletions
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<Network> > _networks; // persisted in networks.d/ Mutex _networks_m; }; |