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

Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev

Browse source
This commit is contained in:
Adam Ierymenko 2021-06-28 17:15:59 -04:00
commit 547b0de8a5
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
2 changed files with 12638 additions and 6104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
controller/FileDB.cpp
View file

@ -140,8 +140,7 @@ void FileDB::eraseNetwork(const uint64_t networkId)
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; nlohmann::json network,member,nullJson;
get(networkId,network); get(networkId,network,memberId,member);
get(memberId,member);
char p[4096]; char p[4096];
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); 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);
OSUtils::rm(p); OSUtils::rm(p);

18739
ext/json/json.hpp
View file

File diff suppressed because it is too large Load diff