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

Update how controller handles circuit tests -- save results to filesystem.

Browse Source
This commit is contained in:
Adam Ierymenko 2017-03-01 16:33:34 -08:00
parent 136fddc7f1
commit a577b8d381
7 changed files with 100 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
controller/EmbeddedNetworkController.cpp
View File

@ -428,9 +428,9 @@ static bool _parseRule(json &r,ZT_VirtualNetworkRule &rule)
return false; return false;
} }
EmbeddedNetworkController::EmbeddedNetworkController(Node *node,const char *dbPath,FILE *feed) : EmbeddedNetworkController::EmbeddedNetworkController(Node *node,const char *dbPath) :
_threadsStarted(false), _threadsStarted(false),
_db(dbPath,feed), _db(dbPath),
_node(node) _node(node)
{ {
OSUtils::mkdir(dbPath); OSUtils::mkdir(dbPath);
@ -546,21 +546,6 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpGET(
return 200; return 200;
} }
} else if ((path[2] == "test")&&(path.size() >= 4)) {
Mutex::Lock _l(_circuitTests_m);
std::map< uint64_t,_CircuitTestEntry >::iterator cte(_circuitTests.find(Utils::hexStrToU64(path[3].c_str())));
if ((cte != _circuitTests.end())&&(cte->second.test)) {
responseBody = "[";
responseBody.append(cte->second.jsonResults);
responseBody.push_back(']');
responseContentType = "application/json";
return 200;
} // else 404
} // else 404 } // else 404
} else { } else {
@ -755,9 +740,10 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST(
return 200; return 200;
} else if ((path.size() == 3)&&(path[2] == "test")) { } else if ((path.size() == 3)&&(path[2] == "test")) {
Mutex::Lock _l(_circuitTests_m); Mutex::Lock _l(_tests_m);
ZT_CircuitTest *test = (ZT_CircuitTest *)malloc(sizeof(ZT_CircuitTest)); _tests.push_back(ZT_CircuitTest());
ZT_CircuitTest *const test = &(_tests.back());
memset(test,0,sizeof(ZT_CircuitTest)); memset(test,0,sizeof(ZT_CircuitTest));
Utils::getSecureRandom(&(test->testId),sizeof(test->testId)); Utils::getSecureRandom(&(test->testId),sizeof(test->testId));
@ -781,7 +767,7 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST(
test->reportAtEveryHop = (OSUtils::jsonBool(b["reportAtEveryHop"],true) ? 1 : 0); test->reportAtEveryHop = (OSUtils::jsonBool(b["reportAtEveryHop"],true) ? 1 : 0);
if (!test->hopCount) { if (!test->hopCount) {
::free((void *)test); _tests.pop_back();
responseBody = "{ \"message\": \"a test must contain at least one hop\" }"; responseBody = "{ \"message\": \"a test must contain at least one hop\" }";
responseContentType = "application/json"; responseContentType = "application/json";
return 400; return 400;
@ -789,18 +775,18 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpPOST(
test->timestamp = OSUtils::now(); test->timestamp = OSUtils::now();
_CircuitTestEntry &te = _circuitTests[test->testId]; if (_node) {
te.test = test;
te.jsonResults = "";
if (_node)
_node->circuitTestBegin(test,&(EmbeddedNetworkController::_circuitTestCallback)); _node->circuitTestBegin(test,&(EmbeddedNetworkController::_circuitTestCallback));
else return 500; } else {
_tests.pop_back();
return 500;
}
char json[1024]; char json[1024];
Utils::snprintf(json,sizeof(json),"{\"testId\":\"%.16llx\"}",test->testId); Utils::snprintf(json,sizeof(json),"{\"testId\":\"%.16llx\"}",test->testId);
responseBody = json; responseBody = json;
responseContentType = "application/json"; responseContentType = "application/json";
return 200; return 200;
} // else 404 } // else 404
@ -1137,62 +1123,67 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpDELETE(
void EmbeddedNetworkController::threadMain() void EmbeddedNetworkController::threadMain()
throw() throw()
{ {
uint64_t lastCircuitTestCheck = 0;
for(;;) { for(;;) {
_RQEntry *const qe = _queue.get(); _RQEntry *const qe = _queue.get(); // waits on next request
if (!qe) break; // enqueue a NULL to terminate threads if (!qe) break; // enqueue a NULL to terminate threads
try { try {
_request(qe->nwid,qe->fromAddr,qe->requestPacketId,qe->identity,qe->metaData); _request(qe->nwid,qe->fromAddr,qe->requestPacketId,qe->identity,qe->metaData);
} catch ( ... ) {} } catch ( ... ) {}
delete qe; delete qe;
uint64_t now = OSUtils::now();
if ((now - lastCircuitTestCheck) > ZT_EMBEDDEDNETWORKCONTROLLER_CIRCUIT_TEST_EXPIRATION) {
lastCircuitTestCheck = now;
Mutex::Lock _l(_tests_m);
for(std::list< ZT_CircuitTest >::iterator i(_tests.begin());i!=_tests.end();) {
if ((now - i->timestamp) > ZT_EMBEDDEDNETWORKCONTROLLER_CIRCUIT_TEST_EXPIRATION) {
_node->circuitTestEnd(&(*i));
_tests.erase(i++);
} else ++i;
}
}
} }
} }
void EmbeddedNetworkController::_circuitTestCallback(ZT_Node *node,ZT_CircuitTest *test,const ZT_CircuitTestReport *report) void EmbeddedNetworkController::_circuitTestCallback(ZT_Node *node,ZT_CircuitTest *test,const ZT_CircuitTestReport *report)
{ {
char tmp[65535]; char tmp[1024],id[128];
EmbeddedNetworkController *const self = reinterpret_cast<EmbeddedNetworkController *>(test->ptr); EmbeddedNetworkController *const self = reinterpret_cast<EmbeddedNetworkController *>(test->ptr);
if (!test) if ((!test)||(!report)||(!test->credentialNetworkId)) return; // sanity check
return;
if (!report)
return;
Mutex::Lock _l(self->_circuitTests_m);
std::map< uint64_t,_CircuitTestEntry >::iterator cte(self->_circuitTests.find(test->testId));
if (cte == self->_circuitTests.end()) { // sanity check: a circuit test we didn't launch?
self->_node->circuitTestEnd(test);
::free((void *)test);
return;
}
const uint64_t now = OSUtils::now();
Utils::snprintf(id,sizeof(id),"network/%.16llx/test/%.16llx-%.16llx-%.10llx-%.10llx",test->credentialNetworkId,test->testId,now,report->upstream,report->current);
Utils::snprintf(tmp,sizeof(tmp), Utils::snprintf(tmp,sizeof(tmp),
"%s{\n" "{\"id\": \"%s\","
"\t\"timestamp\": %llu," ZT_EOL_S "\"timestamp\": %llu,"
"\t\"testId\": \"%.16llx\"," ZT_EOL_S "\"networkId\": \"%.16llx\","
"\t\"upstream\": \"%.10llx\"," ZT_EOL_S "\"testId\": \"%.16llx\","
"\t\"current\": \"%.10llx\"," ZT_EOL_S "\"upstream\": \"%.10llx\","
"\t\"receivedTimestamp\": %llu," ZT_EOL_S "\"current\": \"%.10llx\","
"\t\"sourcePacketId\": \"%.16llx\"," ZT_EOL_S "\"receivedTimestamp\": %llu,"
"\t\"flags\": %llu," ZT_EOL_S "\"sourcePacketId\": \"%.16llx\","
"\t\"sourcePacketHopCount\": %u," ZT_EOL_S "\"flags\": %llu,"
"\t\"errorCode\": %u," ZT_EOL_S "\"sourcePacketHopCount\": %u,"
"\t\"vendor\": %d," ZT_EOL_S "\"errorCode\": %u,"
"\t\"protocolVersion\": %u," ZT_EOL_S "\"vendor\": %d,"
"\t\"majorVersion\": %u," ZT_EOL_S "\"protocolVersion\": %u,"
"\t\"minorVersion\": %u," ZT_EOL_S "\"majorVersion\": %u,"
"\t\"revision\": %u," ZT_EOL_S "\"minorVersion\": %u,"
"\t\"platform\": %d," ZT_EOL_S "\"revision\": %u,"
"\t\"architecture\": %d," ZT_EOL_S "\"platform\": %d,"
"\t\"receivedOnLocalAddress\": \"%s\"," ZT_EOL_S "\"architecture\": %d,"
"\t\"receivedFromRemoteAddress\": \"%s\"" ZT_EOL_S "\"receivedOnLocalAddress\": \"%s\","
"}", "\"receivedFromRemoteAddress\": \"%s\","
((cte->second.jsonResults.length() > 0) ? ",\n" : ""), "\"receivedFromLinkQuality\": %f}",
(unsigned long long)report->timestamp, id + 30, // last bit only, not leading path
(unsigned long long)test->timestamp,
(unsigned long long)test->credentialNetworkId,
(unsigned long long)test->testId, (unsigned long long)test->testId,
(unsigned long long)report->upstream, (unsigned long long)report->upstream,
(unsigned long long)report->current, (unsigned long long)report->current,
(unsigned long long)OSUtils::now(), (unsigned long long)now,
(unsigned long long)report->sourcePacketId, (unsigned long long)report->sourcePacketId,
(unsigned long long)report->flags, (unsigned long long)report->flags,
report->sourcePacketHopCount, report->sourcePacketHopCount,
@ -1205,9 +1196,11 @@ void EmbeddedNetworkController::_circuitTestCallback(ZT_Node *node,ZT_CircuitTes
(int)report->platform, (int)report->platform,
(int)report->architecture, (int)report->architecture,
reinterpret_cast<const InetAddress *>(&(report->receivedOnLocalAddress))->toString().c_str(), reinterpret_cast<const InetAddress *>(&(report->receivedOnLocalAddress))->toString().c_str(),
reinterpret_cast<const InetAddress *>(&(report->receivedFromRemoteAddress))->toString().c_str()); reinterpret_cast<const InetAddress *>(&(report->receivedFromRemoteAddress))->toString().c_str(),
((double)report->receivedFromLinkQuality / (double)ZT_PATH_LINK_QUALITY_MAX));
cte->second.jsonResults.append(tmp); Mutex::Lock _l(self->_db_m);
self->_db.writeRaw(id,std::string(tmp));
} }
void EmbeddedNetworkController::_request( void EmbeddedNetworkController::_request(
@ -1354,12 +1347,12 @@ void EmbeddedNetworkController::_request(
if (requestPacketId) { // only log if this is a request, not for generated pushes if (requestPacketId) { // only log if this is a request, not for generated pushes
json rlEntry = json::object(); json rlEntry = json::object();
rlEntry["ts"] = now; rlEntry["ts"] = now;
rlEntry["authorized"] = (authorizedBy) ? true : false; rlEntry["auth"] = (authorizedBy) ? true : false;
rlEntry["authorizedBy"] = (authorizedBy) ? authorizedBy : ""; rlEntry["authBy"] = (authorizedBy) ? authorizedBy : "";
rlEntry["clientMajorVersion"] = metaData.getUI(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_MAJOR_VERSION,0); rlEntry["vMajor"] = metaData.getUI(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_MAJOR_VERSION,0);
rlEntry["clientMinorVersion"] = metaData.getUI(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_MINOR_VERSION,0); rlEntry["vMinor"] = metaData.getUI(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_MINOR_VERSION,0);
rlEntry["clientRevision"] = metaData.getUI(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_REVISION,0); rlEntry["vRev"] = metaData.getUI(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_NODE_REVISION,0);
rlEntry["clientProtocolVersion"] = metaData.getUI(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_PROTOCOL_VERSION,0); rlEntry["vProto"] = metaData.getUI(ZT_NETWORKCONFIG_REQUEST_METADATA_KEY_PROTOCOL_VERSION,0);
if (fromAddr) if (fromAddr)
rlEntry["fromAddr"] = fromAddr.toString(); rlEntry["fromAddr"] = fromAddr.toString();

15
controller/EmbeddedNetworkController.hpp
View File

@ -46,6 +46,9 @@
// Number of background threads to start -- not actually started until needed // Number of background threads to start -- not actually started until needed
#define ZT_EMBEDDEDNETWORKCONTROLLER_BACKGROUND_THREAD_COUNT 2 #define ZT_EMBEDDEDNETWORKCONTROLLER_BACKGROUND_THREAD_COUNT 2
// TTL for circuit tests
#define ZT_EMBEDDEDNETWORKCONTROLLER_CIRCUIT_TEST_EXPIRATION 120000
namespace ZeroTier { namespace ZeroTier {
class Node; class Node;
@ -56,9 +59,8 @@ public:
/** /**
* @param node Parent node * @param node Parent node
* @param dbPath Path to store data * @param dbPath Path to store data
* @param feed FILE to send feed of all data and changes to (zero-delimited JSON objects) or NULL for none
*/ */
EmbeddedNetworkController(Node *node,const char *dbPath,FILE *feed); EmbeddedNetworkController(Node *node,const char *dbPath);
virtual ~EmbeddedNetworkController(); virtual ~EmbeddedNetworkController();
virtual void init(const Identity &signingId,Sender *sender); virtual void init(const Identity &signingId,Sender *sender);
@ -199,13 +201,8 @@ private:
NetworkController::Sender *_sender; NetworkController::Sender *_sender;
Identity _signingId; Identity _signingId;
struct _CircuitTestEntry std::list< ZT_CircuitTest > _tests;
{ Mutex _tests_m;
ZT_CircuitTest *test;
std::string jsonResults;
};
std::map< uint64_t,_CircuitTestEntry > _circuitTests;
Mutex _circuitTests_m;
std::map< std::pair<uint64_t,uint64_t>,uint64_t > _lastRequestTime; std::map< std::pair<uint64_t,uint64_t>,uint64_t > _lastRequestTime;
Mutex _lastRequestTime_m; Mutex _lastRequestTime_m;

25
controller/JSONDB.cpp
View File

@ -22,6 +22,22 @@ namespace ZeroTier {
static const nlohmann::json _EMPTY_JSON(nlohmann::json::object()); static const nlohmann::json _EMPTY_JSON(nlohmann::json::object());
bool JSONDB::writeRaw(const std::string &n,const std::string &obj)
{
if (!_isValidObjectName(n))
return false;
const std::string path(_genPath(n,true));
if (!path.length())
return false;
const std::string buf(obj);
if (!OSUtils::writeFile(path.c_str(),buf))
return false;
return true;
}
bool JSONDB::put(const std::string &n,const nlohmann::json &obj) bool JSONDB::put(const std::string &n,const nlohmann::json &obj)
{ {
if (!_isValidObjectName(n)) if (!_isValidObjectName(n))
@ -35,9 +51,6 @@ bool JSONDB::put(const std::string &n,const nlohmann::json &obj)
if (!OSUtils::writeFile(path.c_str(),buf)) if (!OSUtils::writeFile(path.c_str(),buf))
return false; return false;
if (_feed)
fwrite(buf.c_str(),buf.length()+1,1,_feed);
_E &e = _db[n]; _E &e = _db[n];
e.obj = obj; e.obj = obj;
e.lastModifiedOnDisk = OSUtils::getLastModified(path.c_str()); e.lastModifiedOnDisk = OSUtils::getLastModified(path.c_str());
@ -72,9 +85,6 @@ const nlohmann::json &JSONDB::get(const std::string &n,unsigned long maxSinceChe
e->second.obj = OSUtils::jsonParse(buf); e->second.obj = OSUtils::jsonParse(buf);
e->second.lastModifiedOnDisk = lm; // don't update these if there is a parse error -- try again and again ASAP e->second.lastModifiedOnDisk = lm; // don't update these if there is a parse error -- try again and again ASAP
e->second.lastCheck = now; e->second.lastCheck = now;
if (_feed)
fwrite(buf.c_str(),buf.length()+1,1,_feed); // it changed, so send to feed (also sends all objects on startup, which we want for Central)
} catch ( ... ) {} // parse errors result in "holding pattern" behavior } catch ( ... ) {} // parse errors result in "holding pattern" behavior
} }
} }
@ -99,9 +109,6 @@ const nlohmann::json &JSONDB::get(const std::string &n,unsigned long maxSinceChe
e2.lastModifiedOnDisk = lm; e2.lastModifiedOnDisk = lm;
e2.lastCheck = now; e2.lastCheck = now;
if (_feed)
fwrite(buf.c_str(),buf.length()+1,1,_feed);
return e2.obj; return e2.obj;
} }
} }

6
controller/JSONDB.hpp
View File

@ -42,8 +42,7 @@ namespace ZeroTier {
class JSONDB class JSONDB
{ {
public: public:
JSONDB(const std::string &basePath,FILE *feed) : JSONDB(const std::string &basePath) :
_feed(feed),
_basePath(basePath) _basePath(basePath)
{ {
_reload(_basePath); _reload(_basePath);
@ -55,6 +54,8 @@ public:
_reload(_basePath); _reload(_basePath);
} }
bool writeRaw(const std::string &n,const std::string &obj);
bool put(const std::string &n,const nlohmann::json &obj); bool put(const std::string &n,const nlohmann::json &obj);
inline bool put(const std::string &n1,const std::string &n2,const nlohmann::json &obj) { return this->put((n1 + "/" + n2),obj); } inline bool put(const std::string &n1,const std::string &n2,const nlohmann::json &obj) { return this->put((n1 + "/" + n2),obj); }
@ -108,7 +109,6 @@ private:
inline bool operator!=(const _E &e) const { return (obj != e.obj); } inline bool operator!=(const _E &e) const { return (obj != e.obj); }
}; };
FILE *_feed;
std::string _basePath; std::string _basePath;
std::map<std::string,_E> _db; std::map<std::string,_E> _db;
}; };

11
controller/README.md
View File

@ -237,11 +237,12 @@ Note that managed IP assignments are only used if they fall within a managed rou
| Field | Type | Description | | Field | Type | Description |
| --------------------- | ------------- | ------------------------------------------------- | | --------------------- | ------------- | ------------------------------------------------- |
| ts | integer | Time of request, ms since epoch | | ts | integer | Time of request, ms since epoch |
| authorized | boolean | Was member authorized? | | auth | boolean | Was member authorized? |
| clientMajorVersion | integer | Client major version or -1 if unknown | | authBy | string | How was member authorized? |
| clientMinorVersion | integer | Client minor version or -1 if unknown | | vMajor | integer | Client major version or -1 if unknown |
| clientRevision | integer | Client revision or -1 if unknown | | vMinor | integer | Client minor version or -1 if unknown |
| clientProtocolVersion | integer | ZeroTier protocol version reported by client | | vRev | integer | Client revision or -1 if unknown |
| vProto | integer | ZeroTier protocol version reported by client |
| fromAddr | string | Physical address if known | | fromAddr | string | Physical address if known |
The controller can only know a member's `fromAddr` if it's able to establish a direct path to it. Members behind very restrictive firewalls may not have this information since the controller will be receiving the member's requests by way of a relay. ZeroTier does not back-trace IP paths as packets are relayed since this would add a lot of protocol overhead. The controller can only know a member's `fromAddr` if it's able to establish a direct path to it. Members behind very restrictive firewalls may not have this information since the controller will be receiving the member's requests by way of a relay. ZeroTier does not back-trace IP paths as packets are relayed since this would add a lot of protocol overhead.

6
node/Peer.cpp
View File

@ -141,10 +141,10 @@ void Peer::received(
path->trustedPacketReceived(now); path->trustedPacketReceived(now);
} }
if (hops == 0) { if (_vProto >= 9)
if (_vProto >= 9) path->updateLinkQuality((unsigned int)(packetId & 7));
path->updateLinkQuality((unsigned int)(packetId & 7));
if (hops == 0) {
bool pathIsConfirmed = false; bool pathIsConfirmed = false;
{ {
Mutex::Lock _l(_paths_m); Mutex::Lock _l(_paths_m);

2
service/OneService.cpp
View File

@ -638,7 +638,7 @@ public:
return _termReason; return _termReason;
} }
_controller = new EmbeddedNetworkController(_node,(_homePath + ZT_PATH_SEPARATOR_S ZT_CONTROLLER_DB_PATH).c_str(),(FILE *)0); _controller = new EmbeddedNetworkController(_node,(_homePath + ZT_PATH_SEPARATOR_S ZT_CONTROLLER_DB_PATH).c_str());
_node->setNetconfMaster((void *)_controller); _node->setNetconfMaster((void *)_controller);
#ifdef ZT_ENABLE_CLUSTER #ifdef ZT_ENABLE_CLUSTER