void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 20:13:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Shutdown fix.

Browse source
This commit is contained in:
Adam Ierymenko 2020-11-18 22:13:06 -05:00
parent a390629371
commit 11545bdb5d
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
osdep/LinuxEthernetTap.cpp
View file

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

1
osdep/LinuxEthernetTap.hpp
View file

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