ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-18 02:40:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Work in progress

Browse Source
This commit is contained in:
Adam Ierymenko 2019-07-23 09:29:08 -07:00
parent 5edd04638d
commit d4d350a285
4 changed files with 91 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controller/EmbeddedNetworkController.cpp
View File

@ -501,12 +501,12 @@ void EmbeddedNetworkController::init(const Identity &signingId,Sender *sender)
#endif
std::string lfJSON;
OSUtils::readFile((_path + ZT_PATH_SEPARATOR_S "local.conf").c_str(),lfJSON);
OSUtils::readFile((_path + ZT_PATH_SEPARATOR_S ".." ZT_PATH_SEPARATOR_S "local.conf").c_str(),lfJSON);
if (lfJSON.length() > 0) {
nlohmann::json lfConfig(OSUtils::jsonParse(lfJSON));
nlohmann::json &settings = lfConfig["settings"];
if (settings.is_object()) {
nlohmann::json &controllerDb = lfConfig["controllerDb"];
nlohmann::json &controllerDb = settings["controllerDb"];
if (controllerDb.is_object()) {
std::string type = controllerDb["type"];
if (type == "lf") {

85
controller/LFDB.cpp
View File

@ -27,6 +27,7 @@
#include "LFDB.hpp"
#include <thread>
#include <chrono>
#include <iostream>
#include <sstream>
@ -53,30 +54,95 @@ LFDB::LFDB(EmbeddedNetworkController *const nc,const Identity &myId,const char *
_myId.address().toString(controllerAddress);
httplib::Client htcli(_lfNodeHost.c_str(),_lfNodePort,600);
std::ostringstream query;
int64_t timeRangeStart = 0;
while (_running) {
std::ostringstream query;
query.clear();
query
<< '{'
<< "\"Ranges\":[{"
<< "\"Name\": \"com.zerotier.controller.lfdb:" << controllerAddress << "\""
<< "\"Name\": \"com.zerotier.controller.lfdb:" << controllerAddress << "/network\","
<< "\"Range\": [ 0,18446744073709551615 ]"
<< "}],"
<< "\"TimeRange\": [ " << timeRangeStart << ",18446744073709551615 ],"
<< "\"MaskingKey\":\"" << controllerAddress << "\","
<< "\"Owners\":[\"" << _lfOwnerPublic << "\"],"
<< "\"Open\":true"
<< "\"Owners\":[\"" << _lfOwnerPublic << "\"]"
<< '}';
auto resp = htcli.Post("/query",query.str(),"application/json");
if (resp->status == 200) {
fprintf(stderr,"%d %s\n",resp->status,resp->body.c_str());
nlohmann::json results(OSUtils::jsonParse(resp->body));
if ((results.is_array())&&(results.size() > 0)) {
for(std::size_t ri=0;ri<results.size();++ri) {
nlohmann::json &rset = results[ri];
if ((rset.is_array())&&(rset.size() > 0)) {
nlohmann::json &result = rset[0];
if (result.is_object()) {
nlohmann::json &record = result["Record"];
if (record.is_object()) {
int64_t ts = record["Timestamp"];
std::string value = result["Value"];
nlohmann::json network(OSUtils::jsonParse(value));
if (network.is_object()) {
std::string idstr = network["id"];
}
}
}
}
}
}
} else {
fprintf(stderr,"ERROR: LFDB: %d from node: %s" ZT_EOL_S,resp->status,resp->body.c_str());
}
query.clear();
query
<< '{'
<< "\"Ranges\":[{"
<< "\"Name\": \"com.zerotier.controller.lfdb:" << controllerAddress << "/network\","
<< "\"Range\": [ 0,18446744073709551615 ]"
<< "},{"
<< "\"Name\": \"com.zerotier.controller.lfdb:" << controllerAddress << "/network/member\","
<< "\"Range\": [ 0,18446744073709551615 ]"
<< "}],"
<< "\"TimeRange\": [ " << timeRangeStart << ",18446744073709551615 ],"
<< "\"MaskingKey\":\"" << controllerAddress << "\","
<< "\"Owners\":[\"" << _lfOwnerPublic << "\"]"
<< '}';
auto resp = htcli.Post("/query",query.str(),"application/json");
if (resp->status == 200) {
nlohmann::json results(OSUtils::jsonParse(resp->body));
if ((results.is_array())&&(results.size() > 0)) {
for(std::size_t ri=0;ri<results.size();++ri) {
nlohmann::json &rset = results[ri];
if ((rset.is_array())&&(rset.size() > 0)) {
nlohmann::json &result = rset[0];
if (result.is_object()) {
nlohmann::json &record = result["Record"];
if (record.is_object()) {
int64_t ts = record["Timestamp"];
std::string value = result["Value"];
nlohmann::json member(OSUtils::jsonParse(value));
if (member.is_object()) {
std::string nwidstr = member["nwid"];
std::string idstr = member["id"];
}
}
}
}
}
}
} else {
fprintf(stderr,"ERROR: LFDB: %d from node: %s" ZT_EOL_S,resp->status,resp->body.c_str());
}
timeRangeStart = time(nullptr) - 120; // start next query 2m before now to avoid losing updates
_ready = true;
for(int k=0;k<10;++k) {
// Delay 2s between queries, checking running flag every 100ms
for(int k=0;k<20;++k) {
if (!_running)
return;
usleep(100000);
std::this_thread::sleep_for(std::chrono::milliseconds(100));
}
}
});
@ -90,8 +156,9 @@ LFDB::~LFDB()
bool LFDB::waitForReady()
{
while (!_ready)
usleep(10000);
while (!_ready) {
std::this_thread::sleep_for(std::chrono::milliseconds(100));
}
}
bool LFDB::isReady()

12
controller/LFDB.hpp
View File

@ -73,14 +73,26 @@ protected:
struct _MemberState
{
_MemberState() :
lastOnlineAddress(),
lastOnlineTime(0),
recordTimestamp(0),
dirty(false),
lastOnlineDirty(false) {}
InetAddress lastOnlineAddress;
int64_t lastOnlineTime;
int64_t recordTimestamp;
bool dirty;
bool lastOnlineDirty;
};
struct _NetworkState
{
_NetworkState() :
members(),
recordTimestamp(0),
dirty(false) {}
std::unordered_map<uint64_t,_MemberState> members;
int64_t recordTimestamp;
bool dirty;
};
std::unordered_map<uint64_t,_NetworkState> _state;

1
objects.mk
View File

@ -30,6 +30,7 @@ ONE_OBJS=\
controller/EmbeddedNetworkController.o \
controller/DB.o \
controller/FileDB.o \
controller/LFDB.o \
controller/PostgreSQL.o \
controller/RabbitMQ.o \
osdep/ManagedRoute.o \