ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-19 15:43:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restore group announcement on Peer::receive() but centralize packet composition in one place.

Browse Source
This commit is contained in:
Adam Ierymenko
2015-10-01 11:37:02 -07:00
parent a3db7d0728
commit 9405150b11
3 changed files with 137 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
node/Network.hpp
View File

@ -93,7 +93,7 @@ public:
/**
* @return Address of network's controller (most significant 40 bits of ID)
*/
inline Address controller() throw() { return Address(_id >> 24); }
inline Address controller() const throw() { return Address(_id >> 24); }
/**
* @param nwid Network ID
@ -140,6 +140,14 @@ public:
*/
void multicastUnsubscribe(const MulticastGroup &mg);
/**
* Announce multicast groups to a peer if that peer is authorized on this network
*
* @param peer Peer to try to announce multicast groups to
* @return True if peer was authorized and groups were announced
*/
bool tryAnnounceMulticastGroupsTo(const SharedPtr<Peer> &peer);
/**
* Apply a NetworkConfig to this network
*
@ -334,6 +342,7 @@ private:
ZT_VirtualNetworkStatus _status() const;
void _externalConfig(ZT_VirtualNetworkConfig *ec) const; // assumes _lock is locked
bool _isAllowed(const SharedPtr<Peer> &peer) const;
bool _tryAnnounceMulticastGroupsTo(const std::vector<Address> &rootAddresses,const std::vector<MulticastGroup> &allMulticastGroups,const SharedPtr<Peer> &peer,uint64_t now) const;
void _announceMulticastGroups();
std::vector<MulticastGroup> _allMulticastGroups() const;