ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-05-07 19:18:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Another fix to Network life cycle.

Browse Source
This commit is contained in:
Adam Ierymenko 2014-08-21 18:07:27 -07:00
parent af62a6cade
commit eadff71d37
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
node/Network.cpp
View File

@ -64,7 +64,11 @@ const char *Network::statusString(const Status s)
Network::~Network() Network::~Network()
{ {
_lock.lock();
if ((_setupThread)&&(!_destroyed)) {
_lock.unlock();
Thread::join(_setupThread); Thread::join(_setupThread);
} else _lock.unlock();
{ {
Mutex::Lock _l(_lock); Mutex::Lock _l(_lock);
@ -414,7 +418,9 @@ void Network::destroy()
_enabled = false; _enabled = false;
_destroyed = true; _destroyed = true;
if (_setupThread)
Thread::join(_setupThread); Thread::join(_setupThread);
_setupThread = Thread();
if (_tap) if (_tap)
_r->tapFactory->close(_tap,true); _r->tapFactory->close(_tap,true);

1
osnet/OSXEthernetTap.cpp
View File

@ -262,6 +262,7 @@ static inline void _intl_freeifmaddrs(struct _intl_ifmaddrs *ifmp)
#include "../node/Constants.hpp" #include "../node/Constants.hpp"
#include "../node/Utils.hpp" #include "../node/Utils.hpp"
#include "../node/Mutex.hpp"
#include "OSXEthernetTap.hpp" #include "OSXEthernetTap.hpp"
// ff:ff:ff:ff:ff:ff with no ADI // ff:ff:ff:ff:ff:ff with no ADI