mirrors/ZeroTierOne
1
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2026-01-30 04:11:21 -08:00
Code Issues Projects Releases Wiki Activity

Merge bf50475a96 into 67648579b5

Browse source
This commit is contained in:
Kang Hu 2026-01-21 02:32:58 +00:00 • committed by GitHub
commit d706be8c60
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
osdep/Phy.hpp
View file

@ -207,6 +207,7 @@ template <typename HANDLER_PTR_TYPE> class Phy {
_whackSendSocket = pipes[1];
_noDelay = noDelay;
_noCheck = noCheck;
FD_SET(_whackReceiveSocket, &_readfds);
}
~Phy()

4
service/OneService.cpp
View file

@ -1014,12 +1014,12 @@ class OneServiceImpl : public OneService {
curl_global_cleanup();
#endif
_controlPlane.stop();
if (_serverThreadRunning) {
_controlPlane.stop();
_serverThread.join();
}
_controlPlaneV6.stop();
if (_serverThreadRunningV6) {
_controlPlaneV6.stop();
_serverThreadV6.join();
}
_rxPacketVector_m.lock();