mirrors/ZeroTierOne
1
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2026-01-15 22:00:55 -08:00
Code Issues Projects Releases Wiki Activity

Remove ancient unused LFDB code and change license notice in controller files.

Browse source
This commit is contained in:
Adam Ierymenko 2025-08-11 17:19:05 -04:00
parent c21636b295
commit c668990b4d
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
21 changed files with 141 additions and 812 deletions
Download patch file Download diff file Expand all files Collapse all files

46
nonfree/controller/EmbeddedNetworkController.cpp
View file

@ -1,15 +1,6 @@
/*
* Copyright (c)2019 ZeroTier, Inc.
*
* Use of this software is governed by the Business Source License included
* in the LICENSE.TXT file in the project's root directory.
*
* Change Date: 2026-01-01
*
* On the date above, in accordance with the Business Source License, use
* of this software will be governed by version 2.0 of the Apache License.
/* (c) ZeroTier, Inc.
* See LICENSE.txt in nonfree/
*/
/****/
#include <stdint.h>
#include <stdio.h>
@ -20,10 +11,9 @@
#ifndef _WIN32
#include <sys/time.h>
#endif
#include "../include/ZeroTierOne.h"
#include "../../include/ZeroTierOne.h"
#include "EmbeddedNetworkController.hpp"
#include "FileDB.hpp"
#include "LFDB.hpp"
#include <algorithm>
#include <cctype>
@ -621,36 +611,6 @@ void EmbeddedNetworkController::init(const Identity& signingId, Sender* sender)
}
#endif
std::string lfJSON;
OSUtils::readFile((_ztPath + 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 = settings["controllerDb"];
if (controllerDb.is_object()) {
std::string type = controllerDb["type"];
if (type == "lf") {
std::string lfOwner = controllerDb["owner"];
std::string lfHost = controllerDb["host"];
int lfPort = controllerDb["port"];
bool storeOnlineState = controllerDb["storeOnlineState"];
if ((lfOwner.length()) && (lfHost.length()) && (lfPort > 0) && (lfPort < 65536)) {
std::size_t pubHdrLoc = lfOwner.find("Public: ");
if ((pubHdrLoc > 0) && ((pubHdrLoc + 8) < lfOwner.length())) {
std::string lfOwnerPublic = lfOwner.substr(pubHdrLoc + 8);
std::size_t pubHdrEnd = lfOwnerPublic.find_first_of("\n\r\t ");
if (pubHdrEnd != std::string::npos) {
lfOwnerPublic = lfOwnerPublic.substr(0, pubHdrEnd);
_db.addDB(std::shared_ptr<DB>(new LFDB(_signingId, _path.c_str(), lfOwner.c_str(), lfOwnerPublic.c_str(), lfHost.c_str(), lfPort, storeOnlineState)));
}
}
}
}
}
}
}
_db.waitForReady();
}