summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--node/MulticastTopology.cpp6
-rw-r--r--node/MulticastTopology.hpp6
-rw-r--r--node/Network.cpp60
-rw-r--r--node/Network.hpp12
4 files changed, 46 insertions, 38 deletions
diff --git a/node/MulticastTopology.cpp b/node/MulticastTopology.cpp
index 419f0ab0..ee6f7954 100644
--- a/node/MulticastTopology.cpp
+++ b/node/MulticastTopology.cpp
@@ -43,6 +43,7 @@ MulticastTopology::~MulticastTopology()
void MulticastTopology::add(const MulticastGroup &mg,const Address &member,const Address &learnedFrom)
{
+ Mutex::Lock _l(_groups_m);
std::vector<MulticastGroupMember> &mv = _groups[mg].members;
for(std::vector<MulticastGroupMember>::iterator m(mv.begin());m!=mv.end();++m) {
if (m->address == member) {
@@ -57,6 +58,7 @@ void MulticastTopology::add(const MulticastGroup &mg,const Address &member,const
void MulticastTopology::erase(const MulticastGroup &mg,const Address &member)
{
+ Mutex::Lock _l(_groups_m);
std::map< MulticastGroup,MulticastGroupStatus >::iterator r(_groups.find(mg));
if (r != _groups.end()) {
for(std::vector<MulticastGroupMember>::iterator m(r->second.members.begin());m!=r->second.members.end();++m) {
@@ -72,6 +74,7 @@ void MulticastTopology::erase(const MulticastGroup &mg,const Address &member)
unsigned int MulticastTopology::want(const MulticastGroup &mg,uint64_t now,unsigned int limit,bool updateLastGatheredTimeOnNonzeroReturn)
{
+ Mutex::Lock _l(_groups_m);
MulticastGroupStatus &gs = _groups[mg];
if ((unsigned int)gs.members.size() >= limit) {
// We already caught our limit, don't need to go fishing any more.
@@ -90,6 +93,7 @@ unsigned int MulticastTopology::want(const MulticastGroup &mg,uint64_t now,unsig
void MulticastTopology::clean(uint64_t now,const Topology &topology)
{
+ Mutex::Lock _l(_groups_m);
for(std::map< MulticastGroup,MulticastGroupStatus >::iterator mm(_groups.begin());mm!=_groups.end();) {
std::vector<MulticastGroupMember>::iterator reader(mm->second.members.begin());
std::vector<MulticastGroupMember>::iterator writer(mm->second.members.begin());
@@ -108,7 +112,7 @@ void MulticastTopology::clean(uint64_t now,const Topology &topology)
SharedPtr<Peer> p(topology.getPeer(writer->learnedFrom));
if (p)
writer->rank = p->lastUnicastFrame() - ZT_MULTICAST_LIKE_EXPIRE;
- else writer->rank = writer->timestamp - 86400000;
+ else writer->rank = writer->timestamp - (86400000 + ZT_MULTICAST_LIKE_EXPIRE);
} else {
SharedPtr<Peer> p(topology.getPeer(writer->address));
if (p)
diff --git a/node/MulticastTopology.hpp b/node/MulticastTopology.hpp
index 276f1a29..17013fc1 100644
--- a/node/MulticastTopology.hpp
+++ b/node/MulticastTopology.hpp
@@ -38,6 +38,7 @@
#include "Address.hpp"
#include "MulticastGroup.hpp"
#include "Utils.hpp"
+#include "Mutex.hpp"
namespace ZeroTier {
@@ -45,8 +46,6 @@ class Topology;
/**
* Database of known multicast peers within a network
- *
- * This structure is not guarded by a mutex; the caller must synchronize access.
*/
class MulticastTopology
{
@@ -100,6 +99,7 @@ public:
*/
inline std::pair<uint64_t,unsigned int> groupStatus(const MulticastGroup &mg) const
{
+ Mutex::Lock _l(_groups_m);
std::map< MulticastGroup,MulticastGroupStatus >::const_iterator r(_groups.find(mg));
return ((r != _groups.end()) ? std::pair<uint64_t,unsigned int>(r->second.lastGatheredMembers,r->second.members.size()) : std::pair<uint64_t,unsigned int>(0,0));
}
@@ -122,6 +122,7 @@ public:
*/
inline void gatheringMembersNow(const MulticastGroup &mg,uint64_t now)
{
+ Mutex::Lock _l(_groups_m);
_groups[mg].lastGatheredMembers = now;
}
@@ -136,6 +137,7 @@ public:
private:
std::map< MulticastGroup,MulticastGroupStatus > _groups;
+ Mutex _groups_m;
};
} // namespace ZeroTier
diff --git a/node/Network.cpp b/node/Network.cpp
index ad5a69a4..d5b04230 100644
--- a/node/Network.cpp
+++ b/node/Network.cpp
@@ -281,43 +281,47 @@ bool Network::isAllowed(const Address &peer) const
void Network::clean()
{
- Mutex::Lock _l(_lock);
+ {
+ Mutex::Lock _l(_lock);
- if (_destroyed)
- return;
+ if (_destroyed)
+ return;
- uint64_t now = Utils::now();
+ uint64_t now = Utils::now();
+
+ if ((_config)&&(_config->isPublic())) {
+ // Open (public) networks do not track certs or cert pushes at all.
+ _membershipCertificates.clear();
+ _lastPushedMembershipCertificate.clear();
+ } else if (_config) {
+ // Clean certificates that are no longer valid from the cache.
+ for(std::map<Address,CertificateOfMembership>::iterator c=(_membershipCertificates.begin());c!=_membershipCertificates.end();) {
+ if (_config->com().agreesWith(c->second))
+ ++c;
+ else _membershipCertificates.erase(c++);
+ }
- if ((_config)&&(_config->isPublic())) {
- // Open (public) networks do not track certs or cert pushes at all.
- _membershipCertificates.clear();
- _lastPushedMembershipCertificate.clear();
- } else if (_config) {
- // Clean certificates that are no longer valid from the cache.
- for(std::map<Address,CertificateOfMembership>::iterator c=(_membershipCertificates.begin());c!=_membershipCertificates.end();) {
- if (_config->com().agreesWith(c->second))
- ++c;
- else _membershipCertificates.erase(c++);
+ // Clean entries from the last pushed tracking map if they're so old as
+ // to be no longer relevant.
+ uint64_t forgetIfBefore = now - (_config->com().timestampMaxDelta() * 3ULL);
+ for(std::map<Address,uint64_t>::iterator lp(_lastPushedMembershipCertificate.begin());lp!=_lastPushedMembershipCertificate.end();) {
+ if (lp->second < forgetIfBefore)
+ _lastPushedMembershipCertificate.erase(lp++);
+ else ++lp;
+ }
}
- // Clean entries from the last pushed tracking map if they're so old as
- // to be no longer relevant.
- uint64_t forgetIfBefore = now - (_config->com().timestampMaxDelta() * 3ULL);
- for(std::map<Address,uint64_t>::iterator lp(_lastPushedMembershipCertificate.begin());lp!=_lastPushedMembershipCertificate.end();) {
- if (lp->second < forgetIfBefore)
- _lastPushedMembershipCertificate.erase(lp++);
- else ++lp;
+ // Clean learned multicast groups if we haven't heard from them in a while
+ for(std::map<MulticastGroup,uint64_t>::iterator mg(_multicastGroupsBehindMe.begin());mg!=_multicastGroupsBehindMe.end();) {
+ if ((now - mg->second) > (ZT_MULTICAST_LIKE_EXPIRE * 2))
+ _multicastGroupsBehindMe.erase(mg++);
+ else ++mg;
}
}
- // Clean learned multicast groups if we haven't heard from them in a while
- for(std::map<MulticastGroup,uint64_t>::iterator mg(_multicastGroupsBehindMe.begin());mg!=_multicastGroupsBehindMe.end();) {
- if ((now - mg->second) > (ZT_MULTICAST_LIKE_EXPIRE * 2))
- _multicastGroupsBehindMe.erase(mg++);
- else ++mg;
+ {
+ _multicastTopology.clean(now,*(_r->topology),(_config) ? _config->multicastLimit() : (unsigned int)ZT_DEFAULT_MULTICAST_LIMIT);
}
-
- _multicastTopology.clean(now,*(_r->topology),(_config) ? _config->multicastLimit() : (unsigned int)ZT_DEFAULT_MULTICAST_LIMIT);
}
Network::Status Network::status() const
diff --git a/node/Network.hpp b/node/Network.hpp
index d5ce1efa..3f0b6eb8 100644
--- a/node/Network.hpp
+++ b/node/Network.hpp
@@ -249,23 +249,21 @@ public:
Status status() const;
/**
- * Update multicast balance for an address and multicast group, return whether packet is allowed
+ * Update and check multicast rate balance for a group
*
- * @param a Originating address of multicast packet
* @param mg Multicast group
* @param bytes Size of packet
* @return True if packet is within budget
*/
- inline bool updateAndCheckMulticastBalance(const Address &a,const MulticastGroup &mg,unsigned int bytes)
+ inline bool updateAndCheckMulticastBalance(const MulticastGroup &mg,unsigned int bytes)
{
Mutex::Lock _l(_lock);
if (!_config)
return false;
- std::pair<Address,MulticastGroup> k(a,mg);
- std::map< std::pair<Address,MulticastGroup>,BandwidthAccount >::iterator bal(_multicastRateAccounts.find(k));
+ std::map< MulticastGroup,BandwidthAccount >::iterator bal(_multicastRateAccounts.find(mg));
if (bal == _multicastRateAccounts.end()) {
NetworkConfig::MulticastRate r(_config->multicastRate(mg));
- bal = _multicastRateAccounts.insert(std::pair< std::pair<Address,MulticastGroup>,BandwidthAccount >(k,BandwidthAccount(r.preload,r.maxBalance,r.accrual))).first;
+ bal = _multicastRateAccounts.insert(std::pair< MulticastGroup,BandwidthAccount >(mg,BandwidthAccount(r.preload,r.maxBalance,r.accrual))).first;
}
return bal->second.deduct(bytes);
}
@@ -348,7 +346,7 @@ public:
}
/**
- * @return Set of currently assigned IP addresses
+ * @return Set of IPs currently assigned to interface
*/
inline std::set<InetAddress> ips() const
{
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-22 01:51:20 +0000