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

cleanup

Browse source
This commit is contained in:
Adam Ierymenko 2018-01-10 15:03:39 -08:00
parent 6304c85d3f
commit f17cc1c6d8
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
controller/FileDB.cpp
View file

@ -23,12 +23,13 @@ namespace ZeroTier
FileDB::FileDB(EmbeddedNetworkController *const nc,const Identity &myId,const char *path) : FileDB::FileDB(EmbeddedNetworkController *const nc,const Identity &myId,const char *path) :
DB(nc,myId,path), DB(nc,myId,path),
_networksPath(_path + ZT_PATH_SEPARATOR_S + "network") _networksPath(_path + ZT_PATH_SEPARATOR_S + "network"),
_tracePath(_path + ZT_PATH_SEPARATOR_S + "trace")
{ {
OSUtils::mkdir(_path.c_str()); OSUtils::mkdir(_path.c_str());
OSUtils::lockDownFile(_path.c_str(),true); OSUtils::lockDownFile(_path.c_str(),true);
OSUtils::mkdir((_path + ZT_PATH_SEPARATOR + "network").c_str()); OSUtils::mkdir(_networksPath.c_str());
OSUtils::mkdir((_path + ZT_PATH_SEPARATOR + "trace").c_str()); OSUtils::mkdir(_tracePath.c_str());
std::vector<std::string> networks(OSUtils::listDirectory(_networksPath.c_str(),false)); std::vector<std::string> networks(OSUtils::listDirectory(_networksPath.c_str(),false));
std::string buf; std::string buf;
@ -120,7 +121,7 @@ void FileDB::save(nlohmann::json *orig,nlohmann::json &record)
} else if (objtype == "trace") { } else if (objtype == "trace") {
const std::string id = record["id"]; const std::string id = record["id"];
if (id.length() > 0) { if (id.length() > 0) {
OSUtils::ztsnprintf(p1,sizeof(p1),"%s" ZT_PATH_SEPARATOR_S "trace" ZT_PATH_SEPARATOR_S "%s.json",_path.c_str(),id.c_str()); OSUtils::ztsnprintf(p1,sizeof(p1),"%s" ZT_PATH_SEPARATOR_S "%s.json",_tracePath.c_str(),id.c_str());
OSUtils::writeFile(p1,OSUtils::jsonDump(record,-1)); OSUtils::writeFile(p1,OSUtils::jsonDump(record,-1));
} }
} }

5
controller/FileDB.hpp
View file

@ -31,17 +31,14 @@ public:
virtual ~FileDB(); virtual ~FileDB();
virtual bool waitForReady(); virtual bool waitForReady();
virtual void save(nlohmann::json *orig,nlohmann::json &record); virtual void save(nlohmann::json *orig,nlohmann::json &record);
virtual void eraseNetwork(const uint64_t networkId); virtual void eraseNetwork(const uint64_t networkId);
virtual void eraseMember(const uint64_t networkId,const uint64_t memberId); virtual void eraseMember(const uint64_t networkId,const uint64_t memberId);
virtual void nodeIsOnline(const uint64_t networkId,const uint64_t memberId,const InetAddress &physicalAddress); virtual void nodeIsOnline(const uint64_t networkId,const uint64_t memberId,const InetAddress &physicalAddress);
protected: protected:
std::string _networksPath; std::string _networksPath;
std::string _tracePath;
}; };
} // namespace ZeroTier } // namespace ZeroTier

4
controller/RethinkDB.hpp
View file

@ -41,13 +41,9 @@ public:
virtual ~RethinkDB(); virtual ~RethinkDB();
virtual bool waitForReady(); virtual bool waitForReady();
virtual void save(nlohmann::json *orig,nlohmann::json &record); virtual void save(nlohmann::json *orig,nlohmann::json &record);
virtual void eraseNetwork(const uint64_t networkId); virtual void eraseNetwork(const uint64_t networkId);
virtual void eraseMember(const uint64_t networkId,const uint64_t memberId); virtual void eraseMember(const uint64_t networkId,const uint64_t memberId);
virtual void nodeIsOnline(const uint64_t networkId,const uint64_t memberId,const InetAddress &physicalAddress); virtual void nodeIsOnline(const uint64_t networkId,const uint64_t memberId,const InetAddress &physicalAddress);
protected: protected: