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

Add functionality to erase members from networks using file backend in controller microservice

Browse Source 
Signed-off-by: Diego Schulz <dschulz@gmail.com>
This commit is contained in:
Diego Schulz 2018-08-02 17:13:55 -04:00
parent 352ec3430f
commit fc6dba0797
No known key found for this signature in database
GPG Key ID: E4595B2BA20C0F9E
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
controller/EmbeddedNetworkController.cpp
View File

@ -1042,6 +1042,7 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpDELETE(
json network,member; json network,member;
_db->get(nwid,network,address,member); _db->get(nwid,network,address,member);
_db->eraseMember(nwid, address);
{ {
std::lock_guard<std::mutex> l(_memberStatus_l); std::lock_guard<std::mutex> l(_memberStatus_l);

14
controller/FileDB.cpp
View File

@ -134,12 +134,24 @@ void FileDB::eraseNetwork(const uint64_t networkId)
get(networkId,network); get(networkId,network);
char p[16384]; char p[16384];
OSUtils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "%.16llx.json",_networksPath.c_str(),networkId); OSUtils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "%.16llx.json",_networksPath.c_str(),networkId);
OSUtils::rm(p);
if (OSUtils::fileExists(p,false)){
OSUtils::rm(p);
}
_networkChanged(network,nullJson,true); _networkChanged(network,nullJson,true);
} }
void FileDB::eraseMember(const uint64_t networkId,const uint64_t memberId) void FileDB::eraseMember(const uint64_t networkId,const uint64_t memberId)
{ {
nlohmann::json network,member,nullJson;
get(networkId,network);
get(memberId,member);
char p[16384];
OSUtils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "%.16llx" ZT_PATH_SEPARATOR_S "member" ZT_PATH_SEPARATOR_S "%.10llx.json",_networksPath.c_str(),networkId,memberId);
if (OSUtils::fileExists(p,false)){
OSUtils::rm(p);
}
_memberChanged(member,nullJson,true);
} }
void FileDB::nodeIsOnline(const uint64_t networkId,const uint64_t memberId,const InetAddress &physicalAddress) void FileDB::nodeIsOnline(const uint64_t networkId,const uint64_t memberId,const InetAddress &physicalAddress)