mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-01-18 02:40:13 +00:00
More work on controller for new Central harnessed mode, remove old http mode.
This commit is contained in:
parent
23fe8975e7
commit
50e7ea088b
@ -35,6 +35,7 @@
|
|||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
#include "../include/ZeroTierOne.h"
|
#include "../include/ZeroTierOne.h"
|
||||||
|
#include "../version.h"
|
||||||
#include "../node/Constants.hpp"
|
#include "../node/Constants.hpp"
|
||||||
|
|
||||||
#include "EmbeddedNetworkController.hpp"
|
#include "EmbeddedNetworkController.hpp"
|
||||||
@ -430,7 +431,7 @@ EmbeddedNetworkController::EmbeddedNetworkController(Node *node,const char *dbPa
|
|||||||
_startTime(OSUtils::now()),
|
_startTime(OSUtils::now()),
|
||||||
_running(true),
|
_running(true),
|
||||||
_lastDumpedStatus(0),
|
_lastDumpedStatus(0),
|
||||||
_db(dbPath),
|
_db(dbPath,this),
|
||||||
_node(node)
|
_node(node)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@ -720,14 +721,6 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST(
|
|||||||
json &revj = member["revision"];
|
json &revj = member["revision"];
|
||||||
member["revision"] = (revj.is_number() ? ((uint64_t)revj + 1ULL) : 1ULL);
|
member["revision"] = (revj.is_number() ? ((uint64_t)revj + 1ULL) : 1ULL);
|
||||||
_db.saveNetworkMember(nwid,address,member);
|
_db.saveNetworkMember(nwid,address,member);
|
||||||
|
|
||||||
// Push update to member if online
|
|
||||||
try {
|
|
||||||
Mutex::Lock _l(_memberStatus_m);
|
|
||||||
_MemberStatus &ms = _memberStatus[_MemberStatusKey(nwid,address)];
|
|
||||||
if ((ms.online(now))&&(ms.lastRequestMetaData))
|
|
||||||
request(nwid,InetAddress(),0,ms.identity,ms.lastRequestMetaData);
|
|
||||||
} catch ( ... ) {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_addMemberNonPersistedFields(nwid,address,member,now);
|
_addMemberNonPersistedFields(nwid,address,member,now);
|
||||||
@ -980,13 +973,6 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST(
|
|||||||
json &revj = network["revision"];
|
json &revj = network["revision"];
|
||||||
network["revision"] = (revj.is_number() ? ((uint64_t)revj + 1ULL) : 1ULL);
|
network["revision"] = (revj.is_number() ? ((uint64_t)revj + 1ULL) : 1ULL);
|
||||||
_db.saveNetwork(nwid,network);
|
_db.saveNetwork(nwid,network);
|
||||||
|
|
||||||
// Send an update to all members of the network that are online
|
|
||||||
Mutex::Lock _l(_memberStatus_m);
|
|
||||||
for(auto i=_memberStatus.begin();i!=_memberStatus.end();++i) {
|
|
||||||
if ((i->first.networkId == nwid)&&(i->second.online(now))&&(i->second.lastRequestMetaData))
|
|
||||||
request(nwid,InetAddress(),0,i->second.identity,i->second.lastRequestMetaData);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
JSONDB::NetworkSummaryInfo ns;
|
JSONDB::NetworkSummaryInfo ns;
|
||||||
@ -1144,6 +1130,28 @@ void EmbeddedNetworkController::handleRemoteTrace(const ZT_RemoteTrace &rt)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void EmbeddedNetworkController::onNetworkUpdate(const uint64_t networkId)
|
||||||
|
{
|
||||||
|
// Send an update to all members of the network that are online
|
||||||
|
const uint64_t now = OSUtils::now();
|
||||||
|
Mutex::Lock _l(_memberStatus_m);
|
||||||
|
for(auto i=_memberStatus.begin();i!=_memberStatus.end();++i) {
|
||||||
|
if ((i->first.networkId == networkId)&&(i->second.online(now))&&(i->second.lastRequestMetaData))
|
||||||
|
request(networkId,InetAddress(),0,i->second.identity,i->second.lastRequestMetaData);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void EmbeddedNetworkController::onNetworkMemberUpdate(const uint64_t networkId,const uint64_t memberId)
|
||||||
|
{
|
||||||
|
// Push update to member if online
|
||||||
|
try {
|
||||||
|
Mutex::Lock _l(_memberStatus_m);
|
||||||
|
_MemberStatus &ms = _memberStatus[_MemberStatusKey(networkId,memberId)];
|
||||||
|
if ((ms.online(OSUtils::now()))&&(ms.lastRequestMetaData))
|
||||||
|
request(networkId,InetAddress(),0,ms.identity,ms.lastRequestMetaData);
|
||||||
|
} catch ( ... ) {}
|
||||||
|
}
|
||||||
|
|
||||||
void EmbeddedNetworkController::threadMain()
|
void EmbeddedNetworkController::threadMain()
|
||||||
throw()
|
throw()
|
||||||
{
|
{
|
||||||
@ -1184,7 +1192,7 @@ void EmbeddedNetworkController::threadMain()
|
|||||||
first = false;
|
first = false;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
OSUtils::ztsnprintf(tmp,sizeof(tmp),"],\"clock\":%llu,\"startTime\":%llu,\"uptime\":%llu}",(unsigned long long)now,(unsigned long long)_startTime,(unsigned long long)(now - _startTime));
|
OSUtils::ztsnprintf(tmp,sizeof(tmp),"],\"clock\":%llu,\"startTime\":%llu,\"uptime\":%llu,\"vMajor\":%d,\"vMinor\":%d,\"vRev\":%d}",(unsigned long long)now,(unsigned long long)_startTime,(unsigned long long)(now - _startTime),ZEROTIER_ONE_VERSION_MAJOR,ZEROTIER_ONE_VERSION_MINOR,ZEROTIER_ONE_VERSION_REVISION);
|
||||||
st.append(tmp);
|
st.append(tmp);
|
||||||
_db.writeRaw("status",st);
|
_db.writeRaw("status",st);
|
||||||
}
|
}
|
||||||
|
@ -93,6 +93,10 @@ public:
|
|||||||
|
|
||||||
void handleRemoteTrace(const ZT_RemoteTrace &rt);
|
void handleRemoteTrace(const ZT_RemoteTrace &rt);
|
||||||
|
|
||||||
|
// Called by JSONDB when networks and network members are changed
|
||||||
|
void onNetworkUpdate(const uint64_t networkId);
|
||||||
|
void onNetworkMemberUpdate(const uint64_t networkId,const uint64_t memberId);
|
||||||
|
|
||||||
void threadMain()
|
void threadMain()
|
||||||
throw();
|
throw();
|
||||||
|
|
||||||
|
@ -29,75 +29,44 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "JSONDB.hpp"
|
#include "JSONDB.hpp"
|
||||||
|
#include "EmbeddedNetworkController.hpp"
|
||||||
#define ZT_JSONDB_HTTP_TIMEOUT 60000
|
|
||||||
|
|
||||||
namespace ZeroTier {
|
namespace ZeroTier {
|
||||||
|
|
||||||
static const nlohmann::json _EMPTY_JSON(nlohmann::json::object());
|
static const nlohmann::json _EMPTY_JSON(nlohmann::json::object());
|
||||||
static const std::map<std::string,std::string> _ZT_JSONDB_GET_HEADERS;
|
|
||||||
|
|
||||||
JSONDB::JSONDB(const std::string &basePath) :
|
JSONDB::JSONDB(const std::string &basePath,EmbeddedNetworkController *parent) :
|
||||||
|
_parent(parent),
|
||||||
_basePath(basePath),
|
_basePath(basePath),
|
||||||
_rawInput(-1),
|
_rawInput(-1),
|
||||||
_rawOutput(-1),
|
_rawOutput(-1),
|
||||||
_summaryThreadRun(true),
|
_summaryThreadRun(true),
|
||||||
_dataReady(false)
|
_dataReady(false)
|
||||||
{
|
{
|
||||||
if ((_basePath.length() > 7)&&(_basePath.substr(0,7) == "http://")) {
|
|
||||||
// If base path is http:// we run in HTTP mode
|
|
||||||
// TODO: this doesn't yet support IPv6 since bracketed address notiation isn't supported.
|
|
||||||
// Typically it's just used with 127.0.0.1 anyway.
|
|
||||||
std::string hn = _basePath.substr(7);
|
|
||||||
std::size_t hnend = hn.find_first_of('/');
|
|
||||||
if (hnend != std::string::npos)
|
|
||||||
hn = hn.substr(0,hnend);
|
|
||||||
std::size_t hnsep = hn.find_last_of(':');
|
|
||||||
if (hnsep != std::string::npos)
|
|
||||||
hn[hnsep] = '/';
|
|
||||||
_httpAddr.fromString(hn.c_str());
|
|
||||||
if (hnend != std::string::npos)
|
|
||||||
_basePath = _basePath.substr(7 + hnend);
|
|
||||||
if (_basePath.length() == 0)
|
|
||||||
_basePath = "/";
|
|
||||||
if (_basePath[0] != '/')
|
|
||||||
_basePath = std::string("/") + _basePath;
|
|
||||||
#ifndef __WINDOWS__
|
#ifndef __WINDOWS__
|
||||||
} else if (_basePath == "-") {
|
if (_basePath == "-") {
|
||||||
// If base path is "-" we run in stdin/stdout mode and expect our database to be populated on startup via stdin
|
// If base path is "-" we run in Central harnessed mode. We read pseudo-http-requests from stdin and write
|
||||||
// Not supported on Windows
|
// them to stdout.
|
||||||
_rawInput = STDIN_FILENO;
|
_rawInput = STDIN_FILENO;
|
||||||
_rawOutput = STDOUT_FILENO;
|
_rawOutput = STDOUT_FILENO;
|
||||||
fcntl(_rawInput,F_SETFL,O_NONBLOCK);
|
fcntl(_rawInput,F_SETFL,O_NONBLOCK);
|
||||||
#endif
|
|
||||||
} else {
|
} else {
|
||||||
|
#endif
|
||||||
// Default mode of operation is to store files in the filesystem
|
// Default mode of operation is to store files in the filesystem
|
||||||
OSUtils::mkdir(_basePath.c_str());
|
OSUtils::mkdir(_basePath.c_str());
|
||||||
OSUtils::lockDownFile(_basePath.c_str(),true); // networks might contain auth tokens, etc., so restrict directory permissions
|
OSUtils::lockDownFile(_basePath.c_str(),true); // networks might contain auth tokens, etc., so restrict directory permissions
|
||||||
|
#ifndef __WINDOWS__
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
_networks_m.lock(); // locked until data is loaded, etc.
|
_networks_m.lock(); // locked until data is loaded, etc.
|
||||||
|
|
||||||
if (_rawInput < 0) {
|
if (_rawInput < 0) {
|
||||||
unsigned int cnt = 0;
|
_load(basePath);
|
||||||
while (!_load(_basePath)) {
|
|
||||||
if ((++cnt & 7) == 0)
|
|
||||||
fprintf(stderr,"WARNING: controller still waiting to read '%s'..." ZT_EOL_S,_basePath.c_str());
|
|
||||||
Thread::sleep(250);
|
|
||||||
}
|
|
||||||
|
|
||||||
for(std::unordered_map<uint64_t,_NW>::iterator n(_networks.begin());n!=_networks.end();++n)
|
|
||||||
_summaryThreadToDo.push_back(n->first);
|
|
||||||
|
|
||||||
if (_summaryThreadToDo.size() > 0) {
|
|
||||||
_summaryThread = Thread::start(this);
|
|
||||||
} else {
|
|
||||||
_dataReady = true;
|
_dataReady = true;
|
||||||
_networks_m.unlock();
|
_networks_m.unlock();
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
// In IPC mode we wait for the first message to start, and we start
|
// In harnessed mode we leave the lock locked and wait for our initial DB from Central.
|
||||||
// this thread since this thread is responsible for reading from stdin.
|
|
||||||
_summaryThread = Thread::start(this);
|
_summaryThread = Thread::start(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -128,16 +97,6 @@ bool JSONDB::writeRaw(const std::string &n,const std::string &obj)
|
|||||||
} else return true;
|
} else return true;
|
||||||
#endif
|
#endif
|
||||||
return false;
|
return false;
|
||||||
} else if (_httpAddr) {
|
|
||||||
std::map<std::string,std::string> headers;
|
|
||||||
std::string body;
|
|
||||||
std::map<std::string,std::string> reqHeaders;
|
|
||||||
char tmp[64];
|
|
||||||
OSUtils::ztsnprintf(tmp,sizeof(tmp),"%lu",(unsigned long)obj.length());
|
|
||||||
reqHeaders["Content-Length"] = tmp;
|
|
||||||
reqHeaders["Content-Type"] = "application/json";
|
|
||||||
const unsigned int sc = Http::PUT(0,ZT_JSONDB_HTTP_TIMEOUT,reinterpret_cast<const struct sockaddr *>(&_httpAddr),(_basePath+"/"+n).c_str(),reqHeaders,obj.data(),(unsigned long)obj.length(),headers,body);
|
|
||||||
return (sc == 200);
|
|
||||||
} else {
|
} else {
|
||||||
const std::string path(_genPath(n,true));
|
const std::string path(_genPath(n,true));
|
||||||
if (!path.length())
|
if (!path.length())
|
||||||
@ -205,10 +164,15 @@ void JSONDB::saveNetwork(const uint64_t networkId,const nlohmann::json &networkC
|
|||||||
char n[64];
|
char n[64];
|
||||||
OSUtils::ztsnprintf(n,sizeof(n),"network/%.16llx",(unsigned long long)networkId);
|
OSUtils::ztsnprintf(n,sizeof(n),"network/%.16llx",(unsigned long long)networkId);
|
||||||
writeRaw(n,OSUtils::jsonDump(networkConfig,-1));
|
writeRaw(n,OSUtils::jsonDump(networkConfig,-1));
|
||||||
|
bool update;
|
||||||
{
|
{
|
||||||
Mutex::Lock _l(_networks_m);
|
Mutex::Lock _l(_networks_m);
|
||||||
_networks[networkId].config = nlohmann::json::to_msgpack(networkConfig);
|
_NW &nw = _networks[networkId];
|
||||||
|
update = !nw.config.empty();
|
||||||
|
nw.config = nlohmann::json::to_msgpack(networkConfig);
|
||||||
}
|
}
|
||||||
|
if (update)
|
||||||
|
_parent->onNetworkUpdate(networkId);
|
||||||
_recomputeSummaryInfo(networkId);
|
_recomputeSummaryInfo(networkId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -217,17 +181,25 @@ void JSONDB::saveNetworkMember(const uint64_t networkId,const uint64_t nodeId,co
|
|||||||
char n[256];
|
char n[256];
|
||||||
OSUtils::ztsnprintf(n,sizeof(n),"network/%.16llx/member/%.10llx",(unsigned long long)networkId,(unsigned long long)nodeId);
|
OSUtils::ztsnprintf(n,sizeof(n),"network/%.16llx/member/%.10llx",(unsigned long long)networkId,(unsigned long long)nodeId);
|
||||||
writeRaw(n,OSUtils::jsonDump(memberConfig,-1));
|
writeRaw(n,OSUtils::jsonDump(memberConfig,-1));
|
||||||
|
bool update;
|
||||||
{
|
{
|
||||||
Mutex::Lock _l(_networks_m);
|
Mutex::Lock _l(_networks_m);
|
||||||
_networks[networkId].members[nodeId] = nlohmann::json::to_msgpack(memberConfig);
|
std::vector<uint8_t> &m = _networks[networkId].members[nodeId];
|
||||||
|
update = !m.empty();
|
||||||
|
m = nlohmann::json::to_msgpack(memberConfig);
|
||||||
_members[nodeId].insert(networkId);
|
_members[nodeId].insert(networkId);
|
||||||
}
|
}
|
||||||
|
if (update)
|
||||||
|
_parent->onNetworkMemberUpdate(networkId,nodeId);
|
||||||
_recomputeSummaryInfo(networkId);
|
_recomputeSummaryInfo(networkId);
|
||||||
}
|
}
|
||||||
|
|
||||||
nlohmann::json JSONDB::eraseNetwork(const uint64_t networkId)
|
nlohmann::json JSONDB::eraseNetwork(const uint64_t networkId)
|
||||||
{
|
{
|
||||||
if (!_httpAddr) { // Member deletion is done by Central in harnessed mode, and deleting the cache network entry also deletes all members
|
if (_rawOutput >= 0) {
|
||||||
|
// In harnessed mode, DB deletes occur in the Central database and we do
|
||||||
|
// not need to erase files.
|
||||||
|
} else {
|
||||||
std::vector<uint64_t> memberIds;
|
std::vector<uint64_t> memberIds;
|
||||||
{
|
{
|
||||||
Mutex::Lock _l(_networks_m);
|
Mutex::Lock _l(_networks_m);
|
||||||
@ -239,24 +211,15 @@ nlohmann::json JSONDB::eraseNetwork(const uint64_t networkId)
|
|||||||
}
|
}
|
||||||
for(std::vector<uint64_t>::iterator m(memberIds.begin());m!=memberIds.end();++m)
|
for(std::vector<uint64_t>::iterator m(memberIds.begin());m!=memberIds.end();++m)
|
||||||
eraseNetworkMember(networkId,*m,false);
|
eraseNetworkMember(networkId,*m,false);
|
||||||
}
|
|
||||||
|
|
||||||
char n[256];
|
char n[256];
|
||||||
OSUtils::ztsnprintf(n,sizeof(n),"network/%.16llx",(unsigned long long)networkId);
|
OSUtils::ztsnprintf(n,sizeof(n),"network/%.16llx",(unsigned long long)networkId);
|
||||||
|
|
||||||
if (_rawOutput >= 0) {
|
|
||||||
// In harnessed mode, deletes occur in Central or other management
|
|
||||||
// software and do not need to be executed this way.
|
|
||||||
} else if (_httpAddr) {
|
|
||||||
std::map<std::string,std::string> headers;
|
|
||||||
std::string body;
|
|
||||||
Http::DEL(0,ZT_JSONDB_HTTP_TIMEOUT,reinterpret_cast<const struct sockaddr *>(&_httpAddr),(_basePath+"/"+n).c_str(),_ZT_JSONDB_GET_HEADERS,headers,body);
|
|
||||||
} else {
|
|
||||||
const std::string path(_genPath(n,false));
|
const std::string path(_genPath(n,false));
|
||||||
if (path.length())
|
if (path.length())
|
||||||
OSUtils::rm(path.c_str());
|
OSUtils::rm(path.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// This also erases all members from the memory cache
|
||||||
{
|
{
|
||||||
Mutex::Lock _l(_networks_m);
|
Mutex::Lock _l(_networks_m);
|
||||||
std::unordered_map<uint64_t,_NW>::iterator i(_networks.find(networkId));
|
std::unordered_map<uint64_t,_NW>::iterator i(_networks.find(networkId));
|
||||||
@ -270,17 +233,11 @@ nlohmann::json JSONDB::eraseNetwork(const uint64_t networkId)
|
|||||||
|
|
||||||
nlohmann::json JSONDB::eraseNetworkMember(const uint64_t networkId,const uint64_t nodeId,bool recomputeSummaryInfo)
|
nlohmann::json JSONDB::eraseNetworkMember(const uint64_t networkId,const uint64_t nodeId,bool recomputeSummaryInfo)
|
||||||
{
|
{
|
||||||
|
if (_rawOutput >= 0) {
|
||||||
|
// In harnessed mode, DB deletes occur in Central and we do not remove files.
|
||||||
|
} else {
|
||||||
char n[256];
|
char n[256];
|
||||||
OSUtils::ztsnprintf(n,sizeof(n),"network/%.16llx/member/%.10llx",(unsigned long long)networkId,(unsigned long long)nodeId);
|
OSUtils::ztsnprintf(n,sizeof(n),"network/%.16llx/member/%.10llx",(unsigned long long)networkId,(unsigned long long)nodeId);
|
||||||
|
|
||||||
if (_rawOutput >= 0) {
|
|
||||||
// In harnessed mode, deletes occur in Central or other management
|
|
||||||
// software and do not need to be executed this way.
|
|
||||||
} else if (_httpAddr) {
|
|
||||||
std::map<std::string,std::string> headers;
|
|
||||||
std::string body;
|
|
||||||
Http::DEL(0,ZT_JSONDB_HTTP_TIMEOUT,reinterpret_cast<const struct sockaddr *>(&_httpAddr),(_basePath+"/"+n).c_str(),_ZT_JSONDB_GET_HEADERS,headers,body);
|
|
||||||
} else {
|
|
||||||
const std::string path(_genPath(n,false));
|
const std::string path(_genPath(n,false));
|
||||||
if (path.length())
|
if (path.length())
|
||||||
OSUtils::rm(path.c_str());
|
OSUtils::rm(path.c_str());
|
||||||
@ -320,7 +277,6 @@ void JSONDB::threadMain()
|
|||||||
while (_summaryThreadRun) {
|
while (_summaryThreadRun) {
|
||||||
#ifndef __WINDOWS__
|
#ifndef __WINDOWS__
|
||||||
if (_rawInput < 0) {
|
if (_rawInput < 0) {
|
||||||
// In HTTP and filesystem mode we just wait for summary to-do items
|
|
||||||
Thread::sleep(25);
|
Thread::sleep(25);
|
||||||
} else {
|
} else {
|
||||||
// In IPC mode we wait but also select() on STDIN to read database updates
|
// In IPC mode we wait but also select() on STDIN to read database updates
|
||||||
@ -337,8 +293,8 @@ void JSONDB::threadMain()
|
|||||||
} else if (rawInputBuf.length() > 0) {
|
} else if (rawInputBuf.length() > 0) {
|
||||||
try {
|
try {
|
||||||
const nlohmann::json obj(OSUtils::jsonParse(rawInputBuf));
|
const nlohmann::json obj(OSUtils::jsonParse(rawInputBuf));
|
||||||
|
|
||||||
gotMessage = true;
|
gotMessage = true;
|
||||||
|
|
||||||
if (!_dataReady) {
|
if (!_dataReady) {
|
||||||
_dataReady = true;
|
_dataReady = true;
|
||||||
_networks_m.unlock();
|
_networks_m.unlock();
|
||||||
@ -351,6 +307,7 @@ void JSONDB::threadMain()
|
|||||||
_add(obj);
|
_add(obj);
|
||||||
}
|
}
|
||||||
} catch ( ... ) {} // ignore malformed JSON
|
} catch ( ... ) {} // ignore malformed JSON
|
||||||
|
|
||||||
rawInputBuf.clear();
|
rawInputBuf.clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -369,7 +326,7 @@ void JSONDB::threadMain()
|
|||||||
else _summaryThreadToDo.swap(todo);
|
else _summaryThreadToDo.swap(todo);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!_dataReady) {
|
if (!_dataReady) { // sanity check
|
||||||
_dataReady = true;
|
_dataReady = true;
|
||||||
_networks_m.unlock();
|
_networks_m.unlock();
|
||||||
}
|
}
|
||||||
@ -460,17 +417,33 @@ bool JSONDB::_add(const nlohmann::json &j)
|
|||||||
if ((id.length() == 16)&&(objtype == "network")) {
|
if ((id.length() == 16)&&(objtype == "network")) {
|
||||||
const uint64_t nwid = Utils::hexStrToU64(id.c_str());
|
const uint64_t nwid = Utils::hexStrToU64(id.c_str());
|
||||||
if (nwid) {
|
if (nwid) {
|
||||||
|
bool update;
|
||||||
|
{
|
||||||
Mutex::Lock _l(_networks_m);
|
Mutex::Lock _l(_networks_m);
|
||||||
_networks[nwid].config = nlohmann::json::to_msgpack(j);
|
_NW &nw = _networks[nwid];
|
||||||
|
update = !nw.config.empty();
|
||||||
|
nw.config = nlohmann::json::to_msgpack(j);
|
||||||
|
}
|
||||||
|
if (update)
|
||||||
|
_parent->onNetworkUpdate(nwid);
|
||||||
|
_recomputeSummaryInfo(nwid);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
} else if ((id.length() == 10)&&(objtype == "member")) {
|
} else if ((id.length() == 10)&&(objtype == "member")) {
|
||||||
const uint64_t mid = Utils::hexStrToU64(id.c_str());
|
const uint64_t mid = Utils::hexStrToU64(id.c_str());
|
||||||
const uint64_t nwid = Utils::hexStrToU64(OSUtils::jsonString(j["nwid"],"0").c_str());
|
const uint64_t nwid = Utils::hexStrToU64(OSUtils::jsonString(j["nwid"],"0").c_str());
|
||||||
if ((mid)&&(nwid)) {
|
if ((mid)&&(nwid)) {
|
||||||
|
bool update;
|
||||||
|
{
|
||||||
Mutex::Lock _l(_networks_m);
|
Mutex::Lock _l(_networks_m);
|
||||||
_networks[nwid].members[mid] = nlohmann::json::to_msgpack(j);
|
std::vector<uint8_t> &m = _networks[nwid].members[mid];
|
||||||
|
update = !m.empty();
|
||||||
|
m = nlohmann::json::to_msgpack(j);
|
||||||
_members[mid].insert(nwid);
|
_members[mid].insert(nwid);
|
||||||
|
}
|
||||||
|
if (update)
|
||||||
|
_parent->onNetworkMemberUpdate(nwid,mid);
|
||||||
|
_recomputeSummaryInfo(nwid);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -484,32 +457,6 @@ bool JSONDB::_load(const std::string &p)
|
|||||||
// This is not used in stdin/stdout mode. Instead data is populated by
|
// This is not used in stdin/stdout mode. Instead data is populated by
|
||||||
// sending it all to stdin.
|
// sending it all to stdin.
|
||||||
|
|
||||||
if (_httpAddr) {
|
|
||||||
// In HTTP harnessed mode we download our entire working data set on startup.
|
|
||||||
|
|
||||||
std::string body;
|
|
||||||
std::map<std::string,std::string> headers;
|
|
||||||
const unsigned int sc = Http::GET(0,ZT_JSONDB_HTTP_TIMEOUT,reinterpret_cast<const struct sockaddr *>(&_httpAddr),_basePath.c_str(),_ZT_JSONDB_GET_HEADERS,headers,body);
|
|
||||||
if (sc == 200) {
|
|
||||||
try {
|
|
||||||
nlohmann::json dbImg(OSUtils::jsonParse(body));
|
|
||||||
std::string tmp;
|
|
||||||
if (dbImg.is_object()) {
|
|
||||||
Mutex::Lock _l(_networks_m);
|
|
||||||
for(nlohmann::json::iterator i(dbImg.begin());i!=dbImg.end();++i) {
|
|
||||||
try {
|
|
||||||
_add(i.value());
|
|
||||||
} catch ( ... ) {}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
} catch ( ... ) {} // invalid JSON, so maybe incomplete request
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
|
|
||||||
} else {
|
|
||||||
// In regular mode we recursively read it from controller.d/ on disk
|
|
||||||
|
|
||||||
std::vector<std::string> dl(OSUtils::listDirectory(p.c_str(),true));
|
std::vector<std::string> dl(OSUtils::listDirectory(p.c_str(),true));
|
||||||
for(std::vector<std::string>::const_iterator di(dl.begin());di!=dl.end();++di) {
|
for(std::vector<std::string>::const_iterator di(dl.begin());di!=dl.end();++di) {
|
||||||
if ((di->length() > 5)&&(di->substr(di->length() - 5) == ".json")) {
|
if ((di->length() > 5)&&(di->substr(di->length() - 5) == ".json")) {
|
||||||
@ -523,9 +470,8 @@ bool JSONDB::_load(const std::string &p)
|
|||||||
this->_load((p + ZT_PATH_SEPARATOR_S + *di));
|
this->_load((p + ZT_PATH_SEPARATOR_S + *di));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
|
||||||
|
|
||||||
}
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void JSONDB::_recomputeSummaryInfo(const uint64_t networkId)
|
void JSONDB::_recomputeSummaryInfo(const uint64_t networkId)
|
||||||
@ -543,23 +489,15 @@ std::string JSONDB::_genPath(const std::string &n,bool create)
|
|||||||
if (pt.size() == 0)
|
if (pt.size() == 0)
|
||||||
return std::string();
|
return std::string();
|
||||||
|
|
||||||
char sep;
|
|
||||||
if (_httpAddr) {
|
|
||||||
sep = '/';
|
|
||||||
create = false;
|
|
||||||
} else {
|
|
||||||
sep = ZT_PATH_SEPARATOR;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string p(_basePath);
|
std::string p(_basePath);
|
||||||
if (create) OSUtils::mkdir(p.c_str());
|
if (create) OSUtils::mkdir(p.c_str());
|
||||||
for(unsigned long i=0,j=(unsigned long)(pt.size()-1);i<j;++i) {
|
for(unsigned long i=0,j=(unsigned long)(pt.size()-1);i<j;++i) {
|
||||||
p.push_back(sep);
|
p.push_back(ZT_PATH_SEPARATOR);
|
||||||
p.append(pt[i]);
|
p.append(pt[i]);
|
||||||
if (create) OSUtils::mkdir(p.c_str());
|
if (create) OSUtils::mkdir(p.c_str());
|
||||||
}
|
}
|
||||||
|
|
||||||
p.push_back(sep);
|
p.push_back(ZT_PATH_SEPARATOR);
|
||||||
p.append(pt[pt.size()-1]);
|
p.append(pt[pt.size()-1]);
|
||||||
p.append(".json");
|
p.append(".json");
|
||||||
|
|
||||||
|
@ -37,11 +37,12 @@
|
|||||||
#include "../node/Mutex.hpp"
|
#include "../node/Mutex.hpp"
|
||||||
#include "../ext/json/json.hpp"
|
#include "../ext/json/json.hpp"
|
||||||
#include "../osdep/OSUtils.hpp"
|
#include "../osdep/OSUtils.hpp"
|
||||||
#include "../osdep/Http.hpp"
|
|
||||||
#include "../osdep/Thread.hpp"
|
#include "../osdep/Thread.hpp"
|
||||||
|
|
||||||
namespace ZeroTier {
|
namespace ZeroTier {
|
||||||
|
|
||||||
|
class EmbeddedNetworkController;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Hierarchical JSON store that persists into the filesystem or via HTTP
|
* Hierarchical JSON store that persists into the filesystem or via HTTP
|
||||||
*/
|
*/
|
||||||
@ -59,7 +60,7 @@ public:
|
|||||||
uint64_t mostRecentDeauthTime;
|
uint64_t mostRecentDeauthTime;
|
||||||
};
|
};
|
||||||
|
|
||||||
JSONDB(const std::string &basePath);
|
JSONDB(const std::string &basePath,EmbeddedNetworkController *parent);
|
||||||
~JSONDB();
|
~JSONDB();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -161,8 +162,8 @@ private:
|
|||||||
void _recomputeSummaryInfo(const uint64_t networkId);
|
void _recomputeSummaryInfo(const uint64_t networkId);
|
||||||
std::string _genPath(const std::string &n,bool create);
|
std::string _genPath(const std::string &n,bool create);
|
||||||
|
|
||||||
|
EmbeddedNetworkController *const _parent;
|
||||||
std::string _basePath;
|
std::string _basePath;
|
||||||
InetAddress _httpAddr;
|
|
||||||
int _rawInput,_rawOutput;
|
int _rawInput,_rawOutput;
|
||||||
Mutex _rawLock;
|
Mutex _rawLock;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user