From 83e395b496c76d8d27fb1d49ee0bfd2a8b2d9b1b Mon Sep 17 00:00:00 2001 From: staphen Date: Wed, 29 Sep 2021 20:13:14 -0400 Subject: [PATCH] Remove call to zts_stop() to prevent race condition during application shutdown --- Source/dvlnet/zerotier_native.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Source/dvlnet/zerotier_native.cpp b/Source/dvlnet/zerotier_native.cpp index 57db32b42..02432b4bb 100644 --- a/Source/dvlnet/zerotier_native.cpp +++ b/Source/dvlnet/zerotier_native.cpp @@ -25,7 +25,6 @@ static constexpr uint64_t ZtNetwork = 0xaf78bf943649eb12; static std::atomic_bool zt_network_ready(false); static std::atomic_bool zt_node_online(false); -static std::atomic_bool zt_started(false); static std::atomic_bool zt_joined(false); static void Callback(struct zts_callback_msg *msg) @@ -55,18 +54,10 @@ bool zerotier_network_ready() return zt_network_ready && zt_node_online; } -void zerotier_network_stop() -{ - zts_stop(); -} - void zerotier_network_start() { - if (zt_started) - return; std::string ztpath = paths::PrefPath() + "zerotier"; zts_start(ztpath.c_str(), (void (*)(void *))Callback, 0); - std::atexit(zerotier_network_stop); } } // namespace net