diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-05-26 19:17:29 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-05-26 19:17:29 -0700 |
| commit | 703c311e0729e170f48d00e23b7dce117700650d (patch) | |
| tree | 4416a4acbcbcf1bf3d169c48466a122ef47a757e /node/Network.hpp | |
| parent | 6e998efd15d0c0c85b8b605d84518cb7197a9086 (diff) | |
| parent | e184aa4cb43151690959d895cba7d1f1bbc036fa (diff) | |
| download | infinitytier-703c311e0729e170f48d00e23b7dce117700650d.tar.gz infinitytier-703c311e0729e170f48d00e23b7dce117700650d.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'node/Network.hpp')
| -rw-r--r-- | node/Network.hpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/node/Network.hpp b/node/Network.hpp index f99ea525..7976d901 100644 --- a/node/Network.hpp +++ b/node/Network.hpp @@ -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; |