ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-05-31 22:40:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove some legacy code from the core loop.

Browse Source
This commit is contained in:
Adam Ierymenko 2014-01-07 15:06:02 -08:00
parent ddb77b1454
commit c1256fff5b
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
node/Node.cpp
View File

@ -416,11 +416,6 @@ Node::ReasonForTermination Node::run()
} }
Utils::lockDownFile(identitySecretPath.c_str(),false); Utils::lockDownFile(identitySecretPath.c_str(),false);
// Clean up some obsolete files if present -- this will be removed later
Utils::rm((_r->homePath + ZT_PATH_SEPARATOR_S + "status"));
Utils::rm((_r->homePath + ZT_PATH_SEPARATOR_S + "thisdeviceismine"));
Utils::rm((_r->homePath + ZT_PATH_SEPARATOR_S + "peer.db"));
// Make sure networks.d exists // Make sure networks.d exists
#ifdef __WINDOWS__ #ifdef __WINDOWS__
CreateDirectoryA((_r->homePath + ZT_PATH_SEPARATOR_S + "networks.d").c_str(),NULL); CreateDirectoryA((_r->homePath + ZT_PATH_SEPARATOR_S + "networks.d").c_str(),NULL);
@ -458,9 +453,9 @@ Node::ReasonForTermination Node::run()
} }
_r->node = this; _r->node = this;
#ifdef ZT_AUTO_UPDATE #ifdef ZT_AUTO_UPDATE
if (ZT_DEFAULTS.updateLatestNfoURL.length()) if (ZT_DEFAULTS.updateLatestNfoURL.length()) {
_r->updater = new SoftwareUpdater(_r); _r->updater = new SoftwareUpdater(_r);
else { } else {
LOG("WARNING: unable to enable software updates: latest .nfo URL from ZT_DEFAULTS is empty (does this platform actually support software updates?)"); LOG("WARNING: unable to enable software updates: latest .nfo URL from ZT_DEFAULTS is empty (does this platform actually support software updates?)");
} }
#endif #endif
@ -502,7 +497,14 @@ Node::ReasonForTermination Node::run()
// Core I/O loop // Core I/O loop
try { try {
/* Shut down if this file exists but fails to open. This is used on Mac to
* shut down automatically on .app deletion by symlinking this to the
* Info.plist file inside the ZeroTier One application. This causes the
* service to die when the user throws away the app, allowing uninstallation
* in the natural Mac way. */
std::string shutdownIfUnreadablePath(_r->homePath + ZT_PATH_SEPARATOR_S + "shutdownIfUnreadable"); std::string shutdownIfUnreadablePath(_r->homePath + ZT_PATH_SEPARATOR_S + "shutdownIfUnreadable");
// Times we last did stuff... used for firing off periodic events.
uint64_t lastNetworkAutoconfCheck = Utils::now() - 5000; // check autoconf again after 5s for startup uint64_t lastNetworkAutoconfCheck = Utils::now() - 5000; // check autoconf again after 5s for startup
uint64_t lastPingCheck = 0; uint64_t lastPingCheck = 0;
uint64_t lastClean = Utils::now(); // don't need to do this immediately uint64_t lastClean = Utils::now(); // don't need to do this immediately
@ -515,7 +517,7 @@ Node::ReasonForTermination Node::run()
if (Utils::fileExists(shutdownIfUnreadablePath.c_str(),false)) { if (Utils::fileExists(shutdownIfUnreadablePath.c_str(),false)) {
FILE *tmpf = fopen(shutdownIfUnreadablePath.c_str(),"r"); FILE *tmpf = fopen(shutdownIfUnreadablePath.c_str(),"r");
if (!tmpf) if (!tmpf)
return impl->terminateBecause(Node::NODE_NORMAL_TERMINATION,"shutdownIfUnreadable was not readable"); return impl->terminateBecause(Node::NODE_NORMAL_TERMINATION,"shutdownIfUnreadable exists but is not readable");
fclose(tmpf); fclose(tmpf);
} }