dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More work on controller for new Central harnessed mode, remove old http mode.

Browse source
This commit is contained in:
Adam Ierymenko 2017-08-16 14:14:49 -07:00
parent 23fe8975e7
commit 50e7ea088b
4 changed files with 106 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

7
controller/JSONDB.hpp
View file

@ -37,11 +37,12 @@
#include "../node/Mutex.hpp"
#include "../ext/json/json.hpp"
#include "../osdep/OSUtils.hpp"
#include "../osdep/Http.hpp"
#include "../osdep/Thread.hpp"
namespace ZeroTier {
class EmbeddedNetworkController;
/**
* Hierarchical JSON store that persists into the filesystem or via HTTP
*/
@ -59,7 +60,7 @@ public:
uint64_t mostRecentDeauthTime;
};
JSONDB(const std::string &basePath);
JSONDB(const std::string &basePath,EmbeddedNetworkController *parent);
~JSONDB();
/**
@ -161,8 +162,8 @@ private:
void _recomputeSummaryInfo(const uint64_t networkId);
std::string _genPath(const std::string &n,bool create);
EmbeddedNetworkController *const _parent;
std::string _basePath;
InetAddress _httpAddr;
int _rawInput,_rawOutput;
Mutex _rawLock;