void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-08-02 15:02:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

let's try this

Browse source
This commit is contained in:
Grant Limberg 2025-07-16 11:13:53 -07:00
parent 3f19712178
commit 5494c44a30
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controller/DB.cpp
View file

@ -520,8 +520,6 @@ void DB::_networkChanged(nlohmann::json& old, nlohmann::json& networkConfig, boo
std::cerr << "Error deauthorizing members on network delete: " << e.what() << std::endl;
}
this->eraseNetwork(networkId);
// delete the network
std::unique_lock<std::shared_mutex> l(_networks_l);
_networks.erase(networkId);

4
controller/EmbeddedNetworkController.cpp
View file

@ -612,11 +612,11 @@ void EmbeddedNetworkController::init(const Identity& signingId, Sender* sender)
#ifdef ZT_CONTROLLER_USE_LIBPQ
if ((_path.length() > 9) && (_path.substr(0, 9) == "postgres:")) {
fprintf(stderr, "CV1\n");
_db.addDB(std::shared_ptr<DB>(new CV1(_signingId, _path.substr(9).c_str(), _listenPort, _rc)));
_db.addDB(std::shared_ptr<CV1>(new CV1(_signingId, _path.substr(9).c_str(), _listenPort, _rc)));
}
else if ((_path.length() > 4) && (_path.substr(0, 4) == "cv2:")) {
fprintf(stderr, "CV2\n");
_db.addDB(std::shared_ptr<DB>(new CV2(_signingId, _path.substr(4).c_str(), _listenPort)));
_db.addDB(std::shared_ptr<CV2>(new CV2(_signingId, _path.substr(4).c_str(), _listenPort)));
}
else {
fprintf(stderr, "FileDB\n");