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

Added ability to specify zt home directory via ZEROTIER_HOME - Addresses ticket #829

Browse Source
This commit is contained in:
Joseph Henry 2018-09-10 16:25:39 -07:00
parent 0fddebc791
commit 3dd9b1aa9b
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osdep/OSUtils.cpp
View File

@ -29,6 +29,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <stdlib.h>
#include "../node/Constants.hpp" #include "../node/Constants.hpp"
#include "../node/Utils.hpp" #include "../node/Utils.hpp"
@ -398,6 +399,21 @@ std::string OSUtils::platformDefaultHomePath()
return homeDir; return homeDir;
#endif #endif
// Check for user-defined environment variable before using defaults
#ifdef __WINDOWS__
DWORD bufferSize = 65535;
std::string userDefinedPath;
bufferSize = GetEnvironmentVariable("ZEROTIER_HOME", &userDefinedPath[0], bufferSize);
if (bufferSize) {
return userDefinedPath;
}
#else
if(const char* userDefinedPath = getenv("ZEROTIER_HOME")) {
return std::string(userDefinedPath);
}
#endif
// Finally, resort to using default paths if no user-defined path was provided
#ifdef __UNIX_LIKE__ #ifdef __UNIX_LIKE__
#ifdef __APPLE__ #ifdef __APPLE__