diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-03-09 07:51:43 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-03-09 07:51:43 -0800 |
| commit | b601041b5bd82aca1e52967c37c78ed953be7751 (patch) | |
| tree | dff8037ee8cb26cfcb6dfd4de8eb037d85a832e8 /service | |
| parent | 0945d6ec0d7b94ba76b5f9490540d35212d21763 (diff) | |
| parent | e61d4ab67ae1a79debccd58910bbe1779780d95d (diff) | |
| download | infinitytier-b601041b5bd82aca1e52967c37c78ed953be7751.tar.gz infinitytier-b601041b5bd82aca1e52967c37c78ed953be7751.zip | |
Merge branch 'edge' of http://10.6.6.2/zerotier/ZeroTierOne into edge
Diffstat (limited to 'service')
| -rw-r--r-- | service/OneService.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index 7013d9dc..7340c954 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -531,10 +531,12 @@ public: #ifdef ZT_USE_MINIUPNPC ,_portMapper((PortMapper *)0) #endif +#ifdef ZT_VAULT_SUPPORT ,_vaultEnabled(false) ,_vaultURL() ,_vaultToken() ,_vaultPath("cubbyhole/zerotier") +#endif ,_run(true) { _ports[0] = 0; @@ -551,6 +553,10 @@ public: _binder.closeAll(_phy); _phy.close(_localControlSocket4); _phy.close(_localControlSocket6); +#if ZT_VAULT_SUPPORT + curl_global_cleanup(); +#endif + #ifdef ZT_USE_MINIUPNPC delete _portMapper; #endif @@ -1541,6 +1547,7 @@ public: } } +#if ZT_VAULT_SUPPORT json &vault = settings["vault"]; if (vault.is_object()) { const std::string url(OSUtils::jsonString(vault["vaultURL"], "").c_str()); @@ -1579,6 +1586,7 @@ public: if (!_vaultURL.empty() && !_vaultToken.empty()) { _vaultEnabled = true; } +#endif } // Checks if a managed IP or route target is allowed |