gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add special case for Ubiquiti routers in platformDefaultHomePath()

Browse Source
This commit is contained in:
Joseph Henry
2020-03-31 20:27:41 -07:00
parent 0d42108254
commit 54f9f2ad53
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
make-linux.mk
View File

@@ -85,6 +85,9 @@ endif
ifeq ($(ZT_QNAP), 1) ifeq ($(ZT_QNAP), 1)
override DEFS+=-D__QNAP__ override DEFS+=-D__QNAP__
endif endif
ifeq ($(ZT_UBIQUITI), 1)
override DEFS+=-D__UBIQUITI__
endif
ifeq ($(ZT_SYNOLOGY), 1) ifeq ($(ZT_SYNOLOGY), 1)
override CFLAGS+=-fPIC override CFLAGS+=-fPIC

4
osdep/OSUtils.cpp
View File

@@ -385,6 +385,10 @@ std::string OSUtils::platformDefaultHomePath()
homeDir.erase(std::remove(homeDir.begin(), homeDir.end(), '\n'), homeDir.end()); homeDir.erase(std::remove(homeDir.begin(), homeDir.end(), '\n'), homeDir.end());
return homeDir; return homeDir;
#endif #endif
#ifdef __UBIQUITI__
// Only persistent location after firmware upgrades
return std::string("/config/zerotier-one");
#else
// Check for user-defined environment variable before using defaults // Check for user-defined environment variable before using defaults
#ifdef __WINDOWS__ #ifdef __WINDOWS__