diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2018-09-25 11:38:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 11:38:25 -0700 |
| commit | 7a42416a783aceecad4cf498b881e83a6c6fcba9 (patch) | |
| tree | 652d2f01edd7f980eca904f0b1bf3303ff381438 /controller | |
| parent | 2a143a75052f13141a1dbbe1f253318b9f5eb69b (diff) | |
| parent | fc6dba079795d9e0c7a053b5539d157c615c68d6 (diff) | |
| download | infinitytier-7a42416a783aceecad4cf498b881e83a6c6fcba9.tar.gz infinitytier-7a42416a783aceecad4cf498b881e83a6c6fcba9.zip | |
Merge pull request #822 from dschulz/controller-patch1-dschulz
Add functionality to erase members from networks using file backend i…
Diffstat (limited to 'controller')
| -rw-r--r-- | controller/EmbeddedNetworkController.cpp | 1 | ||||
| -rw-r--r-- | controller/FileDB.cpp | 14 |
2 files changed, 14 insertions, 1 deletions
diff --git a/controller/EmbeddedNetworkController.cpp b/controller/EmbeddedNetworkController.cpp index 6a4134c6..5e08e1aa 100644 --- a/controller/EmbeddedNetworkController.cpp +++ b/controller/EmbeddedNetworkController.cpp @@ -1043,6 +1043,7 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpDELETE( json network,member; _db->get(nwid,network,address,member); + _db->eraseMember(nwid, address); { std::lock_guard<std::mutex> l(_memberStatus_l); diff --git a/controller/FileDB.cpp b/controller/FileDB.cpp index 8cbd60ce..3f5d46bd 100644 --- a/controller/FileDB.cpp +++ b/controller/FileDB.cpp @@ -136,12 +136,24 @@ void FileDB::eraseNetwork(const uint64_t networkId) get(networkId,network); char p[16384]; 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); } 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) |