ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-04-27 22:39:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweak how Switch passes off to Cluster on relay to fit new paradigm.

Browse Source
This commit is contained in:
Adam Ierymenko 2015-11-09 09:19:03 -08:00
parent ff81415ffe
commit f4d12603e0
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
node/Switch.cpp
View File

@ -621,8 +621,10 @@ void Switch::_handleRemotePacketFragment(const InetAddress &localAddr,const Inet
SharedPtr<Peer> relayTo = RR->topology->getPeer(destination); SharedPtr<Peer> relayTo = RR->topology->getPeer(destination);
if ((!relayTo)||(!relayTo->send(RR,fragment.data(),fragment.size(),RR->node->now()))) { if ((!relayTo)||(!relayTo->send(RR,fragment.data(),fragment.size(),RR->node->now()))) {
#ifdef ZT_ENABLE_CLUSTER #ifdef ZT_ENABLE_CLUSTER
if ((RR->cluster)&&(RR->cluster->sendViaCluster(Address(),destination,fragment.data(),fragment.size(),false))) if (RR->cluster) {
RR->cluster->sendViaCluster(Address(),destination,fragment.data(),fragment.size(),false);
return; return;
}
#endif #endif
// Don't know peer or no direct path -- so relay via root server // Don't know peer or no direct path -- so relay via root server
@ -713,14 +715,15 @@ void Switch::_handleRemotePacketHead(const InetAddress &localAddr,const InetAddr
} else { } else {
#ifdef ZT_ENABLE_CLUSTER #ifdef ZT_ENABLE_CLUSTER
if (RR->cluster) { if (RR->cluster) {
Mutex::Lock _l(_lastUniteAttempt_m); bool shouldUnite;
uint64_t &luts = _lastUniteAttempt[_LastUniteKey(source,destination)]; {
const bool shouldUnite = ((now - luts) >= ZT_MIN_UNITE_INTERVAL); Mutex::Lock _l(_lastUniteAttempt_m);
if (RR->cluster->sendViaCluster(source,destination,packet->data(),packet->size(),shouldUnite)) { uint64_t &luts = _lastUniteAttempt[_LastUniteKey(source,destination)];
if (shouldUnite) shouldUnite = ((now - luts) >= ZT_MIN_UNITE_INTERVAL);
luts = now; luts = now;
return;
} }
RR->cluster->sendViaCluster(source,destination,packet->data(),packet->size(),shouldUnite);
return;
} }
#endif #endif