dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Should fix deadlock issue in GitHub issue #166

Browse source
This commit is contained in:
Adam Ierymenko 2015-05-13 16:55:18 -07:00
parent 241f308334
commit bdce679d84
2 changed files with 32 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
node/Network.hpp
View file

@ -55,6 +55,7 @@
namespace ZeroTier {
class RuntimeEnvironment;
class _AnnounceMulticastGroupsToPeersWithActiveDirectPaths;
/**
* A virtual LAN
@ -62,6 +63,7 @@ class RuntimeEnvironment;
class Network : NonCopyable
{
friend class SharedPtr<Network>;
friend class _AnnounceMulticastGroupsToPeersWithActiveDirectPaths;
public:
/**
@ -197,7 +199,11 @@ public:
* @param peer Peer address to check
* @return True if peer is allowed to communicate on this network
*/
bool isAllowed(const Address &peer) const;
inline bool isAllowed(const Address &peer) const
{
Mutex::Lock _l(_lock);
return _isAllowed(peer);
}
/**
* Perform cleanup and possibly save state
@ -348,6 +354,7 @@ public:
private:
ZT1_VirtualNetworkStatus _status() const;
void _externalConfig(ZT1_VirtualNetworkConfig *ec) const; // assumes _lock is locked
bool _isAllowed(const Address &peer) const;
void _announceMulticastGroups();
const RuntimeEnvironment *RR;