Browse Source

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

Adam Ierymenko 4 years ago
parent
commit
547b0de8a5
2 changed files with 6026 additions and 2188 deletions
  1. 1 2
      controller/FileDB.cpp
  2. 6025 2186
      ext/json/json.hpp

+ 1 - 2
controller/FileDB.cpp

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

File diff suppressed because it is too large
+ 6025 - 2186
ext/json/json.hpp


Some files were not shown because too many files changed in this diff