mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-06-06 12:33:44 +02:00
Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev
This commit is contained in:
commit
547b0de8a5
2 changed files with 12638 additions and 6104 deletions
|
@ -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
18739
ext/json/json.hpp
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue