ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-18 10:46:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'edge' of http://10.6.6.2/zerotier/ZeroTierOne into edge

Browse Source
This commit is contained in:
Adam Ierymenko 2018-03-09 07:51:43 -08:00
commit b601041b5b
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
make-linux.mk
View File

@ -88,6 +88,11 @@ ifeq ($(ZT_USE_TEST_TAP),1)
override DEFS+=-DZT_USE_TEST_TAP override DEFS+=-DZT_USE_TEST_TAP
endif endif
ifeq ($(ZT_VAULT_SUPPORT),1)
override DEFS+=-DZT_VAULT_SUPPORT=1
override LDLIBS+=-lcurl
endif
# Uncomment for gprof profile build # Uncomment for gprof profile build
#CFLAGS=-Wall -g -pg -pthread $(INCLUDES) $(DEFS) #CFLAGS=-Wall -g -pg -pthread $(INCLUDES) $(DEFS)
#CXXFLAGS=-Wall -g -pg -pthread $(INCLUDES) $(DEFS) #CXXFLAGS=-Wall -g -pg -pthread $(INCLUDES) $(DEFS)

5
make-mac.mk
View File

@ -63,6 +63,11 @@ ifeq ($(ZT_TRACE),1)
DEFS+=-DZT_TRACE DEFS+=-DZT_TRACE
endif endif
ifeq ($(ZT_VAULT_SUPPORT),1)
DEFS+=-DZT_VAULT_SUPPORT=1
LIBS+=-lcurl
endif
CXXFLAGS=$(CFLAGS) -std=c++11 -stdlib=libc++ CXXFLAGS=$(CFLAGS) -std=c++11 -stdlib=libc++
all: one macui all: one macui

8
service/OneService.cpp
View File

@ -531,10 +531,12 @@ public:
#ifdef ZT_USE_MINIUPNPC #ifdef ZT_USE_MINIUPNPC
,_portMapper((PortMapper *)0) ,_portMapper((PortMapper *)0)
#endif #endif
#ifdef ZT_VAULT_SUPPORT
,_vaultEnabled(false) ,_vaultEnabled(false)
,_vaultURL() ,_vaultURL()
,_vaultToken() ,_vaultToken()
,_vaultPath("cubbyhole/zerotier") ,_vaultPath("cubbyhole/zerotier")
#endif
,_run(true) ,_run(true)
{ {
_ports[0] = 0; _ports[0] = 0;
@ -551,6 +553,10 @@ public:
_binder.closeAll(_phy); _binder.closeAll(_phy);
_phy.close(_localControlSocket4); _phy.close(_localControlSocket4);
_phy.close(_localControlSocket6); _phy.close(_localControlSocket6);
#if ZT_VAULT_SUPPORT
curl_global_cleanup();
#endif
#ifdef ZT_USE_MINIUPNPC #ifdef ZT_USE_MINIUPNPC
delete _portMapper; delete _portMapper;
#endif #endif
@ -1541,6 +1547,7 @@ public:
} }
} }
#if ZT_VAULT_SUPPORT
json &vault = settings["vault"]; json &vault = settings["vault"];
if (vault.is_object()) { if (vault.is_object()) {
const std::string url(OSUtils::jsonString(vault["vaultURL"], "").c_str()); const std::string url(OSUtils::jsonString(vault["vaultURL"], "").c_str());
@ -1579,6 +1586,7 @@ public:
if (!_vaultURL.empty() && !_vaultToken.empty()) { if (!_vaultURL.empty() && !_vaultToken.empty()) {
_vaultEnabled = true; _vaultEnabled = true;
} }
#endif
} }
// Checks if a managed IP or route target is allowed // Checks if a managed IP or route target is allowed