dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement cross cluster sharing of network configs to make clusters able to actually join networks.

Browse source
This commit is contained in:
Adam Ierymenko 2017-01-30 15:40:22 -08:00
parent ff74ec2482
commit eebd271bb1
3 changed files with 38 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
node/Cluster.cpp
View file

@ -44,6 +44,7 @@
#include "Packet.hpp"
#include "Switch.hpp"
#include "Node.hpp"
#include "Network.hpp"
#include "Array.hpp"
namespace ZeroTier {
@ -469,6 +470,15 @@ void Cluster::handleIncomingStateMessage(const void *msg,unsigned int len)
RR->sw->send(outp,true);
//TRACE("[%u] proxy send %s to %s length %u",(unsigned int)fromMemberId,Packet::verbString(verb),rcpt.toString().c_str(),len);
} break;
case CLUSTER_MESSAGE_NETWORK_CONFIG: {
const SharedPtr<Network> network(RR->node->network(dmsg.at<uint64_t>(ptr)));
if (network) {
// Copy into a Packet just to conform to Network API. Eventually
// will want to refactor.
network->handleConfigChunk(Packet(dmsg),ptr);
}
} break;
}
} catch ( ... ) {
TRACE("invalid message of size %u type %d (inner decode), discarding",mlen,mtype);
@ -494,6 +504,15 @@ void Cluster::broadcastHavePeer(const Identity &id)
}
}
void Cluster::broadcastNetworkConfigChunk(const void *chunk,unsigned int len)
{
Mutex::Lock _l(_memberIds_m);
for(std::vector<uint16_t>::const_iterator mid(_memberIds.begin());mid!=_memberIds.end();++mid) {
Mutex::Lock _l2(_members[*mid].lock);
_send(*mid,CLUSTER_MESSAGE_NETWORK_CONFIG,chunk,len);
}
}
void Cluster::sendViaCluster(const Address &fromPeerAddress,const Address &toPeerAddress,const void *data,unsigned int len,bool unite)
{
if (len > ZT_PROTO_MAX_PACKET_LENGTH) // sanity check