dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Generalize unlink to OS-dep code in Utils, just a little prep for Windows port.

Browse source
This commit is contained in:
Adam Ierymenko 2013-08-08 10:06:39 -04:00
parent 8a46452a70
commit 86056fdbd9
3 changed files with 33 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
node/Network.cpp
View file

@ -111,8 +111,8 @@ Network::~Network()
if (_destroyOnDelete) {
std::string confPath(_r->homePath + ZT_PATH_SEPARATOR_S + "networks.d" + ZT_PATH_SEPARATOR_S + toString() + ".conf");
std::string mcdbPath(_r->homePath + ZT_PATH_SEPARATOR_S + "networks.d" + ZT_PATH_SEPARATOR_S + toString() + ".mcerts");
unlink(confPath.c_str());
unlink(mcdbPath.c_str());
Utils::rm(confPath);
Utils::rm(mcdbPath);
} else {
// Causes flush of membership certs to disk
clean();
@ -204,7 +204,7 @@ void Network::clean()
Mutex::Lock _l(_lock);
if (_configuration.isOpen()) {
_membershipCertificates.clear();
unlink(mcdbPath.c_str());
Utils::rm(mcdbPath);
} else {
FILE *mcdb = fopen(mcdbPath.c_str(),"wb");
bool writeError = false;
@ -236,7 +236,7 @@ void Network::clean()
if (mcdb)
fclose(mcdb);
if (writeError) {
unlink(mcdbPath.c_str());
Utils::rm(mcdbPath);
LOG("error: unable to write to membership cert database at: %s",mcdbPath.c_str());
}
}