Fix socket initialization error on Windows

This commit is contained in:
Joseph Henry
2021-05-12 15:05:18 -07:00
parent 50b84864c1
commit 22f80797b8

View File

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