ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-21 22:07:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Shutdown fix."

Browse Source 
This reverts commit 11545bdb5d.
This commit is contained in:
Adam Ierymenko 2020-11-18 22:24:09 -05:00
parent 11545bdb5d
commit 3712f9b318
No known key found for this signature in database
GPG Key ID: C8877CF2D7A5D7F3
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osdep/LinuxEthernetTap.cpp
View File

@ -92,8 +92,7 @@ LinuxEthernetTap::LinuxEthernetTap(
_homePath(homePath),
_mtu(mtu),
_fd(0),
_enabled(true),
_running(true)
_enabled(true)
{
static std::mutex s_tapCreateLock;
char procpath[128],nwids[32];
@ -268,7 +267,7 @@ LinuxEthernetTap::LinuxEthernetTap(
r = 0;
}
} else if ((errno != EINTR)||(!_running.load())) {
} else {
r = 0;
break;
}
@ -298,12 +297,9 @@ LinuxEthernetTap::LinuxEthernetTap(
LinuxEthernetTap::~LinuxEthernetTap()
{
_running = false;
_tapq.post(std::pair<void *,int>(nullptr,0));
::shutdown(_fd, SHUT_RDWR);
::close(_fd);
pthread_kill(_tapReaderThread.native_handle(), SIGUSR1);
_tapReaderThread.join();
_tapProcessorThread.join();

1
osdep/LinuxEthernetTap.hpp
View File

@ -69,7 +69,6 @@ private:
unsigned int _mtu;
int _fd;
std::atomic_bool _enabled;
std::atomic_bool _running;
std::thread _tapReaderThread;
std::thread _tapProcessorThread;
std::mutex _buffers_l;