summaryrefslogtreecommitdiff
path: root/controller/JSONDB.hpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2017-08-16 14:14:49 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2017-08-16 14:14:49 -0700
commit50e7ea088b16314c8ad9d10757204c966155f157 (patch)
tree499fef9a02cbb12ac90a64ffb02152ed3d27f991 /controller/JSONDB.hpp
parent23fe8975e722ec0141be9c9bea9437b59e6088fa (diff)
downloadinfinitytier-50e7ea088b16314c8ad9d10757204c966155f157.tar.gz
infinitytier-50e7ea088b16314c8ad9d10757204c966155f157.zip
More work on controller for new Central harnessed mode, remove old http mode.
Diffstat (limited to 'controller/JSONDB.hpp')
-rw-r--r--controller/JSONDB.hpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/controller/JSONDB.hpp b/controller/JSONDB.hpp
index 7131b0c1..66d0138a 100644
--- a/controller/JSONDB.hpp
+++ b/controller/JSONDB.hpp
@@ -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;