void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 12:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Take 3

Browse source
This commit is contained in:
Adam Ierymenko 2017-02-01 13:20:51 -08:00
parent e778d45128
commit b378f5dcd7
3 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
node/Cluster.cpp
View file

@ -516,10 +516,10 @@ void Cluster::broadcastNetworkConfigChunk(const void *chunk,unsigned int len)
} }
} }
int Cluster::prepSendViaCluster(const Address &toPeerAddress,void *peerSecret) int Cluster::prepSendViaCluster(const Address &toPeerAddress,uint64_t &mostRecentTs,void *peerSecret)
{ {
const uint64_t now = RR->node->now(); const uint64_t now = RR->node->now();
uint64_t mostRecentTs = 0; mostRecentTs = 0;
int mostRecentMemberId = -1; int mostRecentMemberId = -1;
{ {
Mutex::Lock _l2(_remotePeers_m); Mutex::Lock _l2(_remotePeers_m);

5
node/Cluster.hpp
View file

@ -285,10 +285,11 @@ public:
* Note that outp is only armored (or modified at all) if the return value is a member ID. * Note that outp is only armored (or modified at all) if the return value is a member ID.
* *
* @param toPeerAddress Value of outp.destination(), simply to save additional lookup * @param toPeerAddress Value of outp.destination(), simply to save additional lookup
* @param peerSecret Buffer to fill with peer secret on valid return value, must be at least ZT_PEER_SECRET_KEY_LENGTH bytes * @param ts Result: set to time of last HAVE_PEER from the cluster
* @param peerSecret Result: Buffer to fill with peer secret on valid return value, must be at least ZT_PEER_SECRET_KEY_LENGTH bytes
* @return -1 if cluster does not know this peer, or a member ID to pass to sendViaCluster() * @return -1 if cluster does not know this peer, or a member ID to pass to sendViaCluster()
*/ */
int prepSendViaCluster(const Address &toPeerAddress,void *peerSecret); int prepSendViaCluster(const Address &toPeerAddress,uint64_t &mostRecentTs,void *peerSecret);
/** /**
* Send data via cluster front plane (packet head or fragment) * Send data via cluster front plane (packet head or fragment)

38
node/Switch.cpp
View file

@ -692,6 +692,7 @@ bool Switch::_trySend(Packet &packet,bool encrypt)
const uint64_t now = RR->node->now(); const uint64_t now = RR->node->now();
const Address destination(packet.destination()); const Address destination(packet.destination());
#ifdef ZT_ENABLE_CLUSTER #ifdef ZT_ENABLE_CLUSTER
uint64_t clusterMostRecentTs = 0;
int clusterMostRecentMemberId = -1; int clusterMostRecentMemberId = -1;
uint8_t clusterPeerSecret[ZT_PEER_SECRET_KEY_LENGTH]; uint8_t clusterPeerSecret[ZT_PEER_SECRET_KEY_LENGTH];
#endif #endif
@ -713,25 +714,31 @@ bool Switch::_trySend(Packet &packet,bool encrypt)
} }
if (!viaPath) { if (!viaPath) {
#ifdef ZT_ENABLE_CLUSTER const SharedPtr<Peer> relay(RR->topology->getUpstreamPeer());
if (RR->cluster) if ( (!relay) || (!(viaPath = relay->getBestPath(now,false))) )
clusterMostRecentMemberId = RR->cluster->prepSendViaCluster(destination,clusterPeerSecret); viaPath = peer->getBestPath(now,true);
if (clusterMostRecentMemberId < 0) {
#endif
peer->tryMemorizedPath(now); // periodically attempt memorized or statically defined paths, if any are known
const SharedPtr<Peer> relay(RR->topology->getUpstreamPeer());
if ( (!relay) || (!(viaPath = relay->getBestPath(now,false))) ) {
if (!(viaPath = peer->getBestPath(now,true))) // last resort: try an expired path... we usually can never get here
return false;
}
#ifdef ZT_ENABLE_CLUSTER
}
#endif
} }
#ifdef ZT_ENABLE_CLUSTER
if (RR->cluster)
clusterMostRecentMemberId = RR->cluster->prepSendViaCluster(destination,clusterMostRecentTs,clusterPeerSecret);
if (clusterMostRecentMemberId >= 0) {
if ((viaPath)&&(viaPath->lastIn() < clusterMostRecentTs))
viaPath.zero();
} else if (!viaPath) {
peer->tryMemorizedPath(now); // periodically attempt memorized or statically defined paths, if any are known
return false;
}
#else
if (!viaPath) {
peer->tryMemorizedPath(now); // periodically attempt memorized or statically defined paths, if any are known
return false;
}
#endif
} else { } else {
#ifdef ZT_ENABLE_CLUSTER #ifdef ZT_ENABLE_CLUSTER
if (RR->cluster) if (RR->cluster)
clusterMostRecentMemberId = RR->cluster->prepSendViaCluster(destination,clusterPeerSecret); clusterMostRecentMemberId = RR->cluster->prepSendViaCluster(destination,clusterMostRecentTs,clusterPeerSecret);
if (clusterMostRecentMemberId < 0) { if (clusterMostRecentMemberId < 0) {
#else #else
requestWhois(destination); requestWhois(destination);
@ -742,6 +749,7 @@ bool Switch::_trySend(Packet &packet,bool encrypt)
#endif #endif
} }
// Sanity checks
#ifdef ZT_ENABLE_CLUSTER #ifdef ZT_ENABLE_CLUSTER
if ((!viaPath)&&(clusterMostRecentMemberId < 0)) if ((!viaPath)&&(clusterMostRecentMemberId < 0))
return false; return false;