Some nodeJS work, and apply fix from GitHub issue #166 plus a small optimization to avoid repeated calls to _allMulticastGroups().

This commit is contained in:
Adam Ierymenko 2015-05-25 14:21:05 -07:00
parent d8ad555b9a
commit 5e3c6d9e0d
3 changed files with 50 additions and 20 deletions

View file

@ -106,7 +106,11 @@ public:
/**
* @return All multicast groups including learned groups that are behind any bridges we're attached to
*/
std::vector<MulticastGroup> allMulticastGroups() const;
inline std::vector<MulticastGroup> allMulticastGroups() const
{
Mutex::Lock _l(_lock);
return _allMulticastGroups();
}
/**
* @param mg Multicast group
@ -356,6 +360,7 @@ private:
void _externalConfig(ZT1_VirtualNetworkConfig *ec) const; // assumes _lock is locked
bool _isAllowed(const Address &peer) const;
void _announceMulticastGroups();
std::vector<MulticastGroup> _allMulticastGroups() const;
const RuntimeEnvironment *RR;
uint64_t _id;