From bfe5c758ba38ab453e1f450738d09855c91e66d2 Mon Sep 17 00:00:00 2001 From: Robert Socha Date: Sat, 18 Apr 2020 18:56:28 +0200 Subject: [PATCH 1/4] Add description for Windos service --- windows/ZeroTierOne/ServiceInstaller.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/windows/ZeroTierOne/ServiceInstaller.cpp b/windows/ZeroTierOne/ServiceInstaller.cpp index d302d9f62..ef7007477 100644 --- a/windows/ZeroTierOne/ServiceInstaller.cpp +++ b/windows/ZeroTierOne/ServiceInstaller.cpp @@ -53,6 +53,8 @@ std::string InstallService(PSTR pszServiceName, char szPathTmp[MAX_PATH],szPath[MAX_PATH]; SC_HANDLE schSCManager = NULL; SC_HANDLE schService = NULL; + SERVICE_DESCRIPTION sd; + LPTSTR szDesc = TEXT("Provides secure encrypted communications between hosts over an insecure networks."); if (GetModuleFileName(NULL, szPathTmp, ARRAYSIZE(szPath)) == 0) { @@ -77,7 +79,7 @@ std::string InstallService(PSTR pszServiceName, schSCManager, // SCManager database pszServiceName, // Name of service pszDisplayName, // Name to display - SERVICE_QUERY_STATUS, // Desired access + SERVICE_ALL_ACCESS, // Desired access SERVICE_WIN32_OWN_PROCESS, // Service type dwStartType, // Service start type SERVICE_ERROR_NORMAL, // Error control type @@ -94,6 +96,11 @@ std::string InstallService(PSTR pszServiceName, goto Cleanup; } + // Setup service description + sd.lpDescription = szDesc; + if (!ChangeServiceConfig2(schService, SERVICE_CONFIG_DESCRIPTION, &sd)) { + ret = "CreateService failed (description)"; + } Cleanup: // Centralized cleanup for all allocated resources. if (schSCManager) From 2aecb547d99e6a711859956a71dafa28a87ed97b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 20 Dec 2019 19:35:41 -0800 Subject: [PATCH 2/4] LinuxNetLink: Add cerrno header for (str)errno Fixes compilation under libcxx. --- osdep/LinuxNetLink.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/osdep/LinuxNetLink.cpp b/osdep/LinuxNetLink.cpp index 421da1f63..b0f2d84fb 100644 --- a/osdep/LinuxNetLink.cpp +++ b/osdep/LinuxNetLink.cpp @@ -13,6 +13,8 @@ #include "../node/Constants.hpp" +#include + //#define ZT_NETLINK_TRACE #ifdef __LINUX__ From a8dde7b89b04071a7523096260791d1e406587d8 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Fri, 4 Mar 2022 14:28:25 -0800 Subject: [PATCH 3/4] update JNI to add new status code --- java/jni/ZT_jniutils.cpp | 3 +++ java/src/com/zerotier/sdk/VirtualNetworkStatus.java | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/java/jni/ZT_jniutils.cpp b/java/jni/ZT_jniutils.cpp index b66249577..bcbd31916 100644 --- a/java/jni/ZT_jniutils.cpp +++ b/java/jni/ZT_jniutils.cpp @@ -117,6 +117,9 @@ jobject createVirtualNetworkStatus(JNIEnv *env, ZT_VirtualNetworkStatus status) case ZT_NETWORK_STATUS_OK: fieldName = "NETWORK_STATUS_OK"; break; + case ZT_NETWORK_STATUS_AUTHENTICATION_REQUIRED: + fieldName = "NETWORK_STATUS_AUTHENTICATION_REQUIRED"; + break; case ZT_NETWORK_STATUS_ACCESS_DENIED: fieldName = "NETWORK_STATUS_ACCESS_DENIED"; break; diff --git a/java/src/com/zerotier/sdk/VirtualNetworkStatus.java b/java/src/com/zerotier/sdk/VirtualNetworkStatus.java index 2d00561a1..68e01bd61 100644 --- a/java/src/com/zerotier/sdk/VirtualNetworkStatus.java +++ b/java/src/com/zerotier/sdk/VirtualNetworkStatus.java @@ -37,6 +37,11 @@ public enum VirtualNetworkStatus { */ NETWORK_STATUS_OK, + /** + * Netconf master said SSO auth required. + */ + NETWORK_STATUS_AUTHENTICATION_REQUIRED, + /** * Netconf master told us 'nope' */ From e1a328527342d69f86a394dec6702865a7db22fa Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Mon, 7 Mar 2022 13:52:05 -0500 Subject: [PATCH 4/4] Update ServiceInstaller.cpp Some very minor changes to this PR --- windows/ZeroTierOne/ServiceInstaller.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/windows/ZeroTierOne/ServiceInstaller.cpp b/windows/ZeroTierOne/ServiceInstaller.cpp index ef7007477..05a78002e 100644 --- a/windows/ZeroTierOne/ServiceInstaller.cpp +++ b/windows/ZeroTierOne/ServiceInstaller.cpp @@ -54,7 +54,7 @@ std::string InstallService(PSTR pszServiceName, SC_HANDLE schSCManager = NULL; SC_HANDLE schService = NULL; SERVICE_DESCRIPTION sd; - LPTSTR szDesc = TEXT("Provides secure encrypted communications between hosts over an insecure networks."); + LPTSTR szDesc = TEXT("ZeroTier network virtualization service."); if (GetModuleFileName(NULL, szPathTmp, ARRAYSIZE(szPath)) == 0) { @@ -98,9 +98,7 @@ std::string InstallService(PSTR pszServiceName, // Setup service description sd.lpDescription = szDesc; - if (!ChangeServiceConfig2(schService, SERVICE_CONFIG_DESCRIPTION, &sd)) { - ret = "CreateService failed (description)"; - } + ChangeServiceConfig2(schService, SERVICE_CONFIG_DESCRIPTION, &sd); Cleanup: // Centralized cleanup for all allocated resources. if (schSCManager)