From 22f80797b80b46dfe20acbcb1ceaaf281afff4d2 Mon Sep 17 00:00:00 2001
From: Joseph Henry <joseph.henry@zerotier.com>
Date: Wed, 12 May 2021 15:05:18 -0700
Subject: [PATCH] Fix socket initialization error on Windows

---
 src/Controls.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Controls.cpp b/src/Controls.cpp
index df296c9..dae2a67 100644
--- a/src/Controls.cpp
+++ b/src/Controls.cpp
@@ -69,6 +69,9 @@ int init_subsystems()
     zts_install_signal_handlers();
 #endif   // ZTS_ENABLE_CUSTOM_SIGNAL_HANDLERS
     if (! zts_service) {
+#if defined(__WINDOWS__)
+    WSAStartup(MAKEWORD(2, 2), &wsaData);
+#endif
         zts_service = new NodeService();
         zts_service->setUserEventSystem(zts_events);
     }
@@ -536,7 +539,6 @@ int zts_node_start()
     }
     // Start ZeroTier service
 #if defined(__WINDOWS__)
-    WSAStartup(MAKEWORD(2, 2), &wsaData);
     HANDLE serviceThread = CreateThread(NULL, 0, _runNodeService, (void*)NULL, 0, NULL);
     // TODO: Check success
 #else