ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-19 04:57:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Adam Ierymenko 2017-07-06 10:25:36 -07:00
parent baa10c2995
commit 2f20258807
16 changed files with 239 additions and 423 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/ZeroTierOne.h
View File

@ -1072,9 +1072,9 @@ typedef struct
* identity of a node and its address, the identity (public and secret) * identity of a node and its address, the identity (public and secret)
* must be saved at a minimum. * must be saved at a minimum.
* *
* The reference service implementation currently persists identity, * State objects actually have two IDs (uint64_t[2]). If only one is
* peer identities (for a period of time), planet, moons, and network * listed the second ([1]) should be zero and is ignored in storage
* configurations. Other state is treated as ephemeral. * and replication.
* *
* All state objects should be replicated in cluster mode. The reference * All state objects should be replicated in cluster mode. The reference
* clustering implementation uses a rumor mill algorithm in which state * clustering implementation uses a rumor mill algorithm in which state
@ -1117,15 +1117,6 @@ enum ZT_StateObjectType
*/ */
ZT_STATE_OBJECT_PEER_STATE = 3, ZT_STATE_OBJECT_PEER_STATE = 3,
/**
* The identity of a known peer
*
* Object ID: peer address
* Canonical path: <HOME>/iddb.d/<ADDRESS> (10-digit hex address)
* Persistence: recommended, can be purged at any time, recommended ttl 30-60 days
*/
ZT_STATE_OBJECT_PEER_IDENTITY = 4,
/** /**
* Network configuration * Network configuration
* *
@ -1133,7 +1124,19 @@ enum ZT_StateObjectType
* Canonical path: <HOME>/networks.d/<NETWORKID>.conf (16-digit hex ID) * Canonical path: <HOME>/networks.d/<NETWORKID>.conf (16-digit hex ID)
* Persistence: required if network memberships should persist * Persistence: required if network memberships should persist
*/ */
ZT_STATE_OBJECT_NETWORK_CONFIG = 5, ZT_STATE_OBJECT_NETWORK_CONFIG = 4,
/**
* Network membership (network X peer intersection)
*
* If these are persisted they must be restored after peer states and
* network configs. Otherwise they are ignored.
*
* Object ID: [0] network ID, [1] peer address
* Canonical path: <HOME>/networks.d/<NETWORKID>/members.d/<ADDRESS>
* Persistence: optional (not usually needed)
*/
ZT_STATE_OBJECT_NETWORK_MEMBERSHIP = 5,
/** /**
* The planet (there is only one per... well... planet!) * The planet (there is only one per... well... planet!)
@ -1450,7 +1453,8 @@ void ZT_Node_delete(ZT_Node *node);
* *
* Unless clustering is being implemented this function doesn't need to be * Unless clustering is being implemented this function doesn't need to be
* used after startup. It could be called in response to filesystem changes * used after startup. It could be called in response to filesystem changes
* to allow some degree of live configurability by filesystem observation. * to allow some degree of live configurability by filesystem observation
* but this kind of thing is entirely optional.
* *
* The return value of this function indicates whether the update was accepted * The return value of this function indicates whether the update was accepted
* as new. A return value of ZT_RESULT_OK indicates that the node gleaned new * as new. A return value of ZT_RESULT_OK indicates that the node gleaned new
@ -1468,7 +1472,7 @@ void ZT_Node_delete(ZT_Node *node);
* @param node Node instance * @param node Node instance
* @param tptr Thread pointer to pass to functions/callbacks resulting from this call * @param tptr Thread pointer to pass to functions/callbacks resulting from this call
* @param type State object type * @param type State object type
* @param id State object ID * @param id State object ID (if object type has only one ID, second should be zero)
* @param data State object data * @param data State object data
* @param len Length of state object data in bytes * @param len Length of state object data in bytes
* @return ZT_RESULT_OK if object was accepted or ZT_RESULT_OK_IGNORED if non-informative, error if object was invalid * @return ZT_RESULT_OK if object was accepted or ZT_RESULT_OK_IGNORED if non-informative, error if object was invalid
@ -1477,7 +1481,7 @@ enum ZT_ResultCode ZT_Node_processStateUpdate(
ZT_Node *node, ZT_Node *node,
void *tptr, void *tptr,
ZT_StateObjectType type, ZT_StateObjectType type,
uint64_t id, const uint64_t id[2],
const void *data, const void *data,
unsigned int len); unsigned int len);

12
node/Constants.hpp
View File

@ -216,7 +216,12 @@
/** /**
* How often Topology::clean() and Network::clean() and similar are called, in ms * How often Topology::clean() and Network::clean() and similar are called, in ms
*/ */
#define ZT_HOUSEKEEPING_PERIOD 10000 #define ZT_HOUSEKEEPING_PERIOD 60000
/**
* How often in ms to write peer state to storage and/or cluster (approximate)
*/
#define ZT_PEER_STATE_WRITE_PERIOD 10000
/** /**
* How long to remember peer records in RAM if they haven't been used * How long to remember peer records in RAM if they haven't been used
@ -322,11 +327,6 @@
*/ */
#define ZT_PEER_PATH_EXPIRATION ((ZT_PEER_PING_PERIOD * 4) + 3000) #define ZT_PEER_PATH_EXPIRATION ((ZT_PEER_PING_PERIOD * 4) + 3000)
/**
* Send a full HELLO every this often (ms)
*/
#define ZT_PEER_SEND_FULL_HELLO_EVERY (ZT_PEER_PING_PERIOD * 2)
/** /**
* How often to retry expired paths that we're still remembering * How often to retry expired paths that we're still remembering
*/ */

3
node/Identity.hpp
View File

@ -91,8 +91,11 @@ public:
~Identity() ~Identity()
{ {
if (_privateKey) {
Utils::burn(_privateKey,sizeof(C25519::Private));
delete _privateKey; delete _privateKey;
} }
}
inline Identity &operator=(const Identity &id) inline Identity &operator=(const Identity &id)
{ {

12
node/IncomingPacket.cpp
View File

@ -585,12 +585,6 @@ bool IncomingPacket::_doWHOIS(const RuntimeEnvironment *RR,void *tPtr,const Shar
} else { } else {
// Request unknown WHOIS from upstream from us (if we have one) // Request unknown WHOIS from upstream from us (if we have one)
RR->sw->requestWhois(tPtr,addr); RR->sw->requestWhois(tPtr,addr);
#ifdef ZT_ENABLE_CLUSTER
// Distribute WHOIS queries across a cluster if we do not know the ID.
// This may result in duplicate OKs to the querying peer, which is fine.
if (RR->cluster)
RR->cluster->sendDistributedQuery(*this);
#endif
} }
} }
@ -1055,12 +1049,6 @@ bool IncomingPacket::_doMULTICAST_GATHER(const RuntimeEnvironment *RR,void *tPtr
outp.armor(peer->key(),true,_path->nextOutgoingCounter()); outp.armor(peer->key(),true,_path->nextOutgoingCounter());
_path->send(RR,tPtr,outp.data(),outp.size(),RR->node->now()); _path->send(RR,tPtr,outp.data(),outp.size(),RR->node->now());
} }
// If we are a member of a cluster, distribute this GATHER across it
#ifdef ZT_ENABLE_CLUSTER
if ((RR->cluster)&&(gatheredLocally < gatherLimit))
RR->cluster->sendDistributedQuery(*this);
#endif
} }
peer->received(tPtr,_path,hops(),packetId(),Packet::VERB_MULTICAST_GATHER,0,Packet::VERB_NOP,trustEstablished); peer->received(tPtr,_path,hops(),packetId(),Packet::VERB_MULTICAST_GATHER,0,Packet::VERB_NOP,trustEstablished);

10
node/Network.cpp
View File

@ -1067,11 +1067,6 @@ uint64_t Network::handleConfigChunk(void *tPtr,const uint64_t packetId,const Add
return 0; return 0;
} }
#ifdef ZT_ENABLE_CLUSTER
if ((source)&&(RR->cluster))
RR->cluster->broadcastNetworkConfigChunk(chunk.field(start,chunk.size() - start),chunk.size() - start);
#endif
// New properly verified chunks can be flooded "virally" through the network // New properly verified chunks can be flooded "virally" through the network
if (fastPropagate) { if (fastPropagate) {
Address *a = (Address *)0; Address *a = (Address *)0;
@ -1099,11 +1094,6 @@ uint64_t Network::handleConfigChunk(void *tPtr,const uint64_t packetId,const Add
if ((!c)||(_incomingConfigChunks[i].ts < c->ts)) if ((!c)||(_incomingConfigChunks[i].ts < c->ts))
c = &(_incomingConfigChunks[i]); c = &(_incomingConfigChunks[i]);
} }
#ifdef ZT_ENABLE_CLUSTER
if ((source)&&(RR->cluster))
RR->cluster->broadcastNetworkConfigChunk(chunk.field(start,chunk.size() - start),chunk.size() - start);
#endif
} else { } else {
TRACE("discarded single-chunk unsigned legacy config: this is only allowed if the sender is the controller itself"); TRACE("discarded single-chunk unsigned legacy config: this is only allowed if the sender is the controller itself");
return 0; return 0;

143
node/Node.cpp
View File

@ -68,6 +68,7 @@ Node::Node(void *uptr,void *tptr,const struct ZT_Node_Callbacks *callbacks,uint6
throw std::runtime_error("callbacks struct version mismatch"); throw std::runtime_error("callbacks struct version mismatch");
memcpy(&_cb,callbacks,sizeof(ZT_Node_Callbacks)); memcpy(&_cb,callbacks,sizeof(ZT_Node_Callbacks));
// Initialize non-cryptographic PRNG from a good random source
Utils::getSecureRandom((void *)_prngState,sizeof(_prngState)); Utils::getSecureRandom((void *)_prngState,sizeof(_prngState));
_online = false; _online = false;
@ -78,33 +79,34 @@ Node::Node(void *uptr,void *tptr,const struct ZT_Node_Callbacks *callbacks,uint6
uint64_t idtmp[2]; uint64_t idtmp[2];
idtmp[0] = 0; idtmp[1] = 0; idtmp[0] = 0; idtmp[1] = 0;
char tmp[512]; char tmp[1024];
std::string tmp2;
int n = stateObjectGet(tptr,ZT_STATE_OBJECT_IDENTITY_SECRET,idtmp,tmp,sizeof(tmp) - 1); int n = stateObjectGet(tptr,ZT_STATE_OBJECT_IDENTITY_SECRET,idtmp,tmp,sizeof(tmp) - 1);
if (n > 0) { if (n > 0) {
tmp[n] = (char)0; tmp[n] = (char)0;
if (!RR->identity.fromString(tmp)) if (RR->identity.fromString(tmp)) {
RR->publicIdentityStr = RR->identity.toString(false);
RR->secretIdentityStr = RR->identity.toString(true);
} else {
n = -1; n = -1;
} }
}
idtmp[0] = RR->identity.address().toInt(); idtmp[1] = 0; idtmp[0] = RR->identity.address().toInt(); idtmp[1] = 0;
if (n <= 0) { if (n <= 0) {
RR->identity.generate(); RR->identity.generate();
tmp2 = RR->identity.toString(true); RR->publicIdentityStr = RR->identity.toString(false);
stateObjectPut(tptr,ZT_STATE_OBJECT_IDENTITY_SECRET,idtmp,tmp2.data(),(unsigned int)tmp2.length()); RR->secretIdentityStr = RR->identity.toString(true);
tmp2 = RR->identity.toString(false); stateObjectPut(tptr,ZT_STATE_OBJECT_IDENTITY_SECRET,idtmp,RR->secretIdentityStr.data(),(unsigned int)RR->secretIdentityStr.length());
stateObjectPut(tptr,ZT_STATE_OBJECT_IDENTITY_PUBLIC,idtmp,tmp2.data(),(unsigned int)tmp2.length()); stateObjectPut(tptr,ZT_STATE_OBJECT_IDENTITY_PUBLIC,idtmp,RR->publicIdentityStr.data(),(unsigned int)RR->publicIdentityStr.length());
} else { } else {
n = stateObjectGet(tptr,ZT_STATE_OBJECT_IDENTITY_PUBLIC,idtmp,tmp,sizeof(tmp) - 1); n = stateObjectGet(tptr,ZT_STATE_OBJECT_IDENTITY_PUBLIC,idtmp,tmp,sizeof(tmp) - 1);
if (n > 0) { if (n > 0) {
tmp[n] = (char)0; tmp[n] = (char)0;
if (RR->identity.toString(false) != tmp) if (RR->publicIdentityStr != tmp)
n = -1; n = -1;
} }
if (n <= 0) { if (n <= 0)
tmp2 = RR->identity.toString(false); stateObjectPut(tptr,ZT_STATE_OBJECT_IDENTITY_PUBLIC,idtmp,RR->publicIdentityStr.data(),(unsigned int)RR->publicIdentityStr.length());
stateObjectPut(tptr,ZT_STATE_OBJECT_IDENTITY_PUBLIC,idtmp,tmp2.data(),(unsigned int)tmp2.length());
}
} }
try { try {
@ -124,25 +126,21 @@ Node::Node(void *uptr,void *tptr,const struct ZT_Node_Callbacks *callbacks,uint6
} }
Node::~Node() Node::~Node()
{
{ {
Mutex::Lock _l(_networks_m); Mutex::Lock _l(_networks_m);
_networks.clear(); // destroy all networks before shutdown _networks.clear(); // destroy all networks before shutdown
}
delete RR->sa; delete RR->sa;
delete RR->topology; delete RR->topology;
delete RR->mc; delete RR->mc;
delete RR->sw; delete RR->sw;
#ifdef ZT_ENABLE_CLUSTER
delete RR->cluster;
#endif
} }
ZT_ResultCode Node::processStateUpdate( ZT_ResultCode Node::processStateUpdate(
void *tptr, void *tptr,
ZT_StateObjectType type, ZT_StateObjectType type,
uint64_t id, const uint64_t id[2],
const void *data, const void *data,
unsigned int len) unsigned int len)
{ {
@ -151,11 +149,12 @@ ZT_ResultCode Node::processStateUpdate(
case ZT_STATE_OBJECT_PEER_STATE: case ZT_STATE_OBJECT_PEER_STATE:
if (len) { if (len) {
const SharedPtr<Peer> p(RR->topology->getPeer(tptr,Address(id[0])));
if (p) {
r = (p->applyStateUpdate(data,len)) ? ZT_RESULT_OK : ZT_RESULT_OK_IGNORED;
} else {
r = (Peer::createFromStateUpdate(RR,tptr,data,len)) ? ZT_RESULT_OK : ZT_RESULT_OK_IGNORED;
} }
break;
case ZT_STATE_OBJECT_PEER_IDENTITY:
if (len) {
} }
break; break;
@ -163,9 +162,9 @@ ZT_ResultCode Node::processStateUpdate(
if (len <= (ZT_NETWORKCONFIG_DICT_CAPACITY - 1)) { if (len <= (ZT_NETWORKCONFIG_DICT_CAPACITY - 1)) {
if (len < 2) { if (len < 2) {
Mutex::Lock _l(_networks_m); Mutex::Lock _l(_networks_m);
SharedPtr<Network> &nw = _networks[id]; SharedPtr<Network> &nw = _networks[id[0]];
if (!nw) { if (!nw) {
nw = SharedPtr<Network>(new Network(RR,tptr,id,(void *)0,(const NetworkConfig *)0)); nw = SharedPtr<Network>(new Network(RR,tptr,id[0],(void *)0,(const NetworkConfig *)0));
r = ZT_RESULT_OK; r = ZT_RESULT_OK;
} }
} else { } else {
@ -175,7 +174,7 @@ ZT_ResultCode Node::processStateUpdate(
try { try {
if (nconf->fromDictionary(*dict)) { if (nconf->fromDictionary(*dict)) {
Mutex::Lock _l(_networks_m); Mutex::Lock _l(_networks_m);
SharedPtr<Network> &nw = _networks[id]; SharedPtr<Network> &nw = _networks[id[0]];
if (nw) { if (nw) {
switch (nw->setConfiguration(tptr,*nconf,false)) { switch (nw->setConfiguration(tptr,*nconf,false)) {
default: default:
@ -189,7 +188,7 @@ ZT_ResultCode Node::processStateUpdate(
break; break;
} }
} else { } else {
nw = SharedPtr<Network>(new Network(RR,tptr,id,(void *)0,nconf)); nw = SharedPtr<Network>(new Network(RR,tptr,id[0],(void *)0,nconf));
} }
} else { } else {
r = ZT_RESULT_ERROR_BAD_PARAMETER; r = ZT_RESULT_ERROR_BAD_PARAMETER;
@ -208,9 +207,14 @@ ZT_ResultCode Node::processStateUpdate(
} }
break; break;
case ZT_STATE_OBJECT_NETWORK_MEMBERSHIP:
if (len) {
}
break;
case ZT_STATE_OBJECT_PLANET: case ZT_STATE_OBJECT_PLANET:
case ZT_STATE_OBJECT_MOON: case ZT_STATE_OBJECT_MOON:
if (len <= ZT_WORLD_MAX_SERIALIZED_LENGTH) { if ((len)&&(len <= ZT_WORLD_MAX_SERIALIZED_LENGTH)) {
World w; World w;
try { try {
w.deserialize(Buffer<ZT_WORLD_MAX_SERIALIZED_LENGTH>(data,len)); w.deserialize(Buffer<ZT_WORLD_MAX_SERIALIZED_LENGTH>(data,len));
@ -395,18 +399,7 @@ ZT_ResultCode Node::processBackgroundTasks(void *tptr,uint64_t now,volatile uint
} }
try { try {
#ifdef ZT_ENABLE_CLUSTER
// If clustering is enabled we have to call cluster->doPeriodicTasks() very often, so we override normal timer deadline behavior
if (RR->cluster) {
RR->sw->doTimerTasks(tptr,now);
RR->cluster->doPeriodicTasks();
*nextBackgroundTaskDeadline = now + ZT_CLUSTER_PERIODIC_TASK_PERIOD; // this is really short so just tick at this rate
} else {
#endif
*nextBackgroundTaskDeadline = now + (uint64_t)std::max(std::min(timeUntilNextPingCheck,RR->sw->doTimerTasks(tptr,now)),(unsigned long)ZT_CORE_TIMER_TASK_GRANULARITY); *nextBackgroundTaskDeadline = now + (uint64_t)std::max(std::min(timeUntilNextPingCheck,RR->sw->doTimerTasks(tptr,now)),(unsigned long)ZT_CORE_TIMER_TASK_GRANULARITY);
#ifdef ZT_ENABLE_CLUSTER
}
#endif
} catch ( ... ) { } catch ( ... ) {
return ZT_RESULT_FATAL_ERROR_INTERNAL; return ZT_RESULT_FATAL_ERROR_INTERNAL;
} }
@ -620,76 +613,6 @@ void Node::setNetconfMaster(void *networkControllerInstance)
RR->localNetworkController->init(RR->identity,this); RR->localNetworkController->init(RR->identity,this);
} }
/*
ZT_ResultCode Node::clusterInit(
unsigned int myId,
const struct sockaddr_storage *zeroTierPhysicalEndpoints,
unsigned int numZeroTierPhysicalEndpoints,
int x,
int y,
int z,
void (*sendFunction)(void *,unsigned int,const void *,unsigned int),
void *sendFunctionArg,
int (*addressToLocationFunction)(void *,const struct sockaddr_storage *,int *,int *,int *),
void *addressToLocationFunctionArg)
{
#ifdef ZT_ENABLE_CLUSTER
if (RR->cluster)
return ZT_RESULT_ERROR_BAD_PARAMETER;
std::vector<InetAddress> eps;
for(unsigned int i=0;i<numZeroTierPhysicalEndpoints;++i)
eps.push_back(InetAddress(zeroTierPhysicalEndpoints[i]));
std::sort(eps.begin(),eps.end());
RR->cluster = new Cluster(RR,myId,eps,x,y,z,sendFunction,sendFunctionArg,addressToLocationFunction,addressToLocationFunctionArg);
return ZT_RESULT_OK;
#else
return ZT_RESULT_ERROR_UNSUPPORTED_OPERATION;
#endif
}
ZT_ResultCode Node::clusterAddMember(unsigned int memberId)
{
#ifdef ZT_ENABLE_CLUSTER
if (!RR->cluster)
return ZT_RESULT_ERROR_BAD_PARAMETER;
RR->cluster->addMember((uint16_t)memberId);
return ZT_RESULT_OK;
#else
return ZT_RESULT_ERROR_UNSUPPORTED_OPERATION;
#endif
}
void Node::clusterRemoveMember(unsigned int memberId)
{
#ifdef ZT_ENABLE_CLUSTER
if (RR->cluster)
RR->cluster->removeMember((uint16_t)memberId);
#endif
}
void Node::clusterHandleIncomingMessage(const void *msg,unsigned int len)
{
#ifdef ZT_ENABLE_CLUSTER
if (RR->cluster)
RR->cluster->handleIncomingStateMessage(msg,len);
#endif
}
void Node::clusterStatus(ZT_ClusterStatus *cs)
{
if (!cs)
return;
#ifdef ZT_ENABLE_CLUSTER
if (RR->cluster)
RR->cluster->status(*cs);
else
#endif
memset(cs,0,sizeof(ZT_ClusterStatus));
}
*/
/****************************************************************************/ /****************************************************************************/
/* Node methods used only within node/ */ /* Node methods used only within node/ */
/****************************************************************************/ /****************************************************************************/
@ -918,7 +841,7 @@ enum ZT_ResultCode ZT_Node_processStateUpdate(
ZT_Node *node, ZT_Node *node,
void *tptr, void *tptr,
ZT_StateObjectType type, ZT_StateObjectType type,
uint64_t id, const uint64_t id[2],
const void *data, const void *data,
unsigned int len) unsigned int len)
{ {

2
node/Node.hpp
View File

@ -85,7 +85,7 @@ public:
ZT_ResultCode processStateUpdate( ZT_ResultCode processStateUpdate(
void *tptr, void *tptr,
ZT_StateObjectType type, ZT_StateObjectType type,
uint64_t id, const uint64_t id[2],
const void *data, const void *data,
unsigned int len); unsigned int len);
ZT_ResultCode processWirePacket( ZT_ResultCode processWirePacket(

13
node/Path.hpp
View File

@ -46,11 +46,6 @@
*/ */
#define ZT_PATH_MAX_PREFERENCE_RANK ((ZT_INETADDRESS_MAX_SCOPE << 1) | 1) #define ZT_PATH_MAX_PREFERENCE_RANK ((ZT_INETADDRESS_MAX_SCOPE << 1) | 1)
/**
* Maximum distance for a path
*/
#define ZT_PATH_DISTANCE_MAX 0xffff
namespace ZeroTier { namespace ZeroTier {
class RuntimeEnvironment; class RuntimeEnvironment;
@ -125,7 +120,6 @@ public:
_incomingLinkQualitySlowLogCounter(-64), // discard first fast log _incomingLinkQualitySlowLogCounter(-64), // discard first fast log
_incomingLinkQualityPreviousPacketCounter(0), _incomingLinkQualityPreviousPacketCounter(0),
_outgoingPacketCounter(0), _outgoingPacketCounter(0),
_distance(ZT_PATH_DISTANCE_MAX),
_addr(), _addr(),
_localAddress(), _localAddress(),
_ipScope(InetAddress::IP_SCOPE_NONE) _ipScope(InetAddress::IP_SCOPE_NONE)
@ -143,7 +137,6 @@ public:
_incomingLinkQualitySlowLogCounter(-64), // discard first fast log _incomingLinkQualitySlowLogCounter(-64), // discard first fast log
_incomingLinkQualityPreviousPacketCounter(0), _incomingLinkQualityPreviousPacketCounter(0),
_outgoingPacketCounter(0), _outgoingPacketCounter(0),
_distance(ZT_PATH_DISTANCE_MAX),
_addr(addr), _addr(addr),
_localAddress(localAddress), _localAddress(localAddress),
_ipScope(addr.ipScope()) _ipScope(addr.ipScope())
@ -311,11 +304,6 @@ public:
*/ */
inline uint64_t lastTrustEstablishedPacketReceived() const { return _lastTrustEstablishedPacketReceived; } inline uint64_t lastTrustEstablishedPacketReceived() const { return _lastTrustEstablishedPacketReceived; }
/**
* @return Distance (higher is further)
*/
inline unsigned int distance() const { return _distance; }
/** /**
* @param lo Last out send * @param lo Last out send
* @param li Last in send * @param li Last in send
@ -344,7 +332,6 @@ private:
volatile signed int _incomingLinkQualitySlowLogCounter; volatile signed int _incomingLinkQualitySlowLogCounter;
volatile unsigned int _incomingLinkQualityPreviousPacketCounter; volatile unsigned int _incomingLinkQualityPreviousPacketCounter;
volatile unsigned int _outgoingPacketCounter; volatile unsigned int _outgoingPacketCounter;
volatile unsigned int _distance;
InetAddress _addr; InetAddress _addr;
InetAddress _localAddress; InetAddress _localAddress;
InetAddress::IpScope _ipScope; // memoize this since it's a computed value checked often InetAddress::IpScope _ipScope; // memoize this since it's a computed value checked often

109
node/Peer.cpp
View File

@ -146,8 +146,8 @@ void Peer::received(
path->updateLinkQuality((unsigned int)(packetId & 7)); path->updateLinkQuality((unsigned int)(packetId & 7));
if (hops == 0) { if (hops == 0) {
// If this is a direct packet (no hops), update existing paths or learn new ones
bool pathAlreadyKnown = false; bool pathAlreadyKnown = false;
bool newPathLearned = false;
{ {
Mutex::Lock _l(_paths_m); Mutex::Lock _l(_paths_m);
@ -188,7 +188,7 @@ void Peer::received(
if (verb == Packet::VERB_OK) { if (verb == Packet::VERB_OK) {
potentialNewPeerPath->lr = now; potentialNewPeerPath->lr = now;
potentialNewPeerPath->p = path; potentialNewPeerPath->p = path;
newPathLearned = true; _lastWroteState = 0; // force state write now
} else { } else {
TRACE("got %s via unknown path %s(%s), confirming...",Packet::verbString(verb),_id.address().toString().c_str(),path->address().toString().c_str()); TRACE("got %s via unknown path %s(%s), confirming...",Packet::verbString(verb),_id.address().toString().c_str(),path->address().toString().c_str());
attemptToContactAt(tPtr,path->localAddress(),path->address(),now,true,path->nextOutgoingCounter()); attemptToContactAt(tPtr,path->localAddress(),path->address(),now,true,path->nextOutgoingCounter());
@ -196,9 +196,6 @@ void Peer::received(
} }
} }
} }
if (newPathLearned)
writeState(tPtr,now);
} else if (this->trustEstablished(now)) { } else if (this->trustEstablished(now)) {
// Send PUSH_DIRECT_PATHS if hops>0 (relayed) and we have a trust relationship (common network membership) // Send PUSH_DIRECT_PATHS if hops>0 (relayed) and we have a trust relationship (common network membership)
if ((now - _lastDirectPathPushSent) >= ZT_DIRECT_PATH_PUSH_INTERVAL) { if ((now - _lastDirectPathPushSent) >= ZT_DIRECT_PATH_PUSH_INTERVAL) {
@ -270,6 +267,9 @@ void Peer::received(
} }
} }
} }
if ((now - _lastWroteState) > ZT_PEER_STATE_WRITE_PERIOD)
writeState(tPtr,now);
} }
bool Peer::sendDirect(void *tPtr,const void *data,unsigned int len,uint64_t now,bool force) bool Peer::sendDirect(void *tPtr,const void *data,unsigned int len,uint64_t now,bool force)
@ -435,7 +435,7 @@ bool Peer::doPingAndKeepalive(void *tPtr,uint64_t now,int inetAddressFamily)
void Peer::writeState(void *tPtr,const uint64_t now) void Peer::writeState(void *tPtr,const uint64_t now)
{ {
try { try {
Buffer<sizeof(Peer) + 32 + (sizeof(Path) * 2)> b; Buffer<ZT_PEER_MAX_SERIALIZED_STATE_SIZE> b;
b.append((uint8_t)1); // version b.append((uint8_t)1); // version
b.append(now); b.append(now);
@ -455,7 +455,6 @@ void Peer::writeState(void *tPtr,const uint64_t now)
b.append(_v4Path.p->lastOut()); b.append(_v4Path.p->lastOut());
b.append(_v4Path.p->lastIn()); b.append(_v4Path.p->lastIn());
b.append(_v4Path.p->lastTrustEstablishedPacketReceived()); b.append(_v4Path.p->lastTrustEstablishedPacketReceived());
b.append((uint16_t)_v4Path.p->distance());
_v4Path.p->address().serialize(b); _v4Path.p->address().serialize(b);
_v4Path.p->localAddress().serialize(b); _v4Path.p->localAddress().serialize(b);
} }
@ -464,29 +463,29 @@ void Peer::writeState(void *tPtr,const uint64_t now)
b.append(_v6Path.p->lastOut()); b.append(_v6Path.p->lastOut());
b.append(_v6Path.p->lastIn()); b.append(_v6Path.p->lastIn());
b.append(_v6Path.p->lastTrustEstablishedPacketReceived()); b.append(_v6Path.p->lastTrustEstablishedPacketReceived());
b.append((uint16_t)_v6Path.p->distance());
_v6Path.p->address().serialize(b); _v6Path.p->address().serialize(b);
_v6Path.p->localAddress().serialize(b); _v6Path.p->localAddress().serialize(b);
} }
} }
b.append(_lastReceive); // Save space by sending these as time since now at 100ms resolution
b.append(_lastNontrivialReceive); b.append((uint16_t)(std::max(now - _lastReceive,(uint64_t)6553500) / 100));
b.append(_lastTriedMemorizedPath); b.append((uint16_t)(std::max(now - _lastNontrivialReceive,(uint64_t)6553500) / 100));
b.append(_lastDirectPathPushSent); b.append((uint16_t)(std::max(now - _lastTriedMemorizedPath,(uint64_t)6553500) / 100));
b.append(_lastDirectPathPushReceive); b.append((uint16_t)(std::max(now - _lastDirectPathPushSent,(uint64_t)6553500) / 100));
b.append(_lastCredentialRequestSent); b.append((uint16_t)(std::max(now - _lastDirectPathPushReceive,(uint64_t)6553500) / 100));
b.append(_lastWhoisRequestReceived); b.append((uint16_t)(std::max(now - _lastCredentialRequestSent,(uint64_t)6553500) / 100));
b.append(_lastEchoRequestReceived); b.append((uint16_t)(std::max(now - _lastWhoisRequestReceived,(uint64_t)6553500) / 100));
b.append(_lastComRequestReceived); b.append((uint16_t)(std::max(now - _lastEchoRequestReceived,(uint64_t)6553500) / 100));
b.append(_lastComRequestSent); b.append((uint16_t)(std::max(now - _lastComRequestReceived,(uint64_t)6553500) / 100));
b.append(_lastCredentialsReceived); b.append((uint16_t)(std::max(now - _lastComRequestSent,(uint64_t)6553500) / 100));
b.append(_lastTrustEstablishedPacketReceived); b.append((uint16_t)(std::max(now - _lastCredentialsReceived,(uint64_t)6553500) / 100));
b.append((uint16_t)(std::max(now - _lastTrustEstablishedPacketReceived,(uint64_t)6553500) / 100));
b.append(_vProto); b.append((uint8_t)_vProto);
b.append(_vMajor); b.append((uint8_t)_vMajor);
b.append(_vMinor); b.append((uint8_t)_vMinor);
b.append(_vRevision); b.append((uint16_t)_vRevision);
b.append((uint16_t)0); // length of additional fields b.append((uint16_t)0); // length of additional fields
@ -501,7 +500,7 @@ void Peer::writeState(void *tPtr,const uint64_t now)
bool Peer::applyStateUpdate(const void *data,unsigned int len) bool Peer::applyStateUpdate(const void *data,unsigned int len)
{ {
try { try {
Buffer<sizeof(Peer) + 32 + (sizeof(Path) * 2)> b(data,len); Buffer<ZT_PEER_MAX_SERIALIZED_STATE_SIZE> b(data,len);
unsigned int ptr = 0; unsigned int ptr = 0;
if (b[ptr++] != 1) if (b[ptr++] != 1)
@ -510,6 +509,11 @@ bool Peer::applyStateUpdate(const void *data,unsigned int len)
if (ts <= _lastReceivedStateTimestamp) if (ts <= _lastReceivedStateTimestamp)
return false; return false;
Identity id;
ptr += id.deserialize(b,ptr);
if (id != _id) // sanity check
return false;
const unsigned int pathCount = (unsigned int)b[ptr++]; const unsigned int pathCount = (unsigned int)b[ptr++];
{ {
Mutex::Lock _l(_paths_m); Mutex::Lock _l(_paths_m);
@ -518,7 +522,6 @@ bool Peer::applyStateUpdate(const void *data,unsigned int len)
const uint64_t lastOut = b.at<uint64_t>(ptr); ptr += 8; const uint64_t lastOut = b.at<uint64_t>(ptr); ptr += 8;
const uint64_t lastIn = b.at<uint64_t>(ptr); ptr += 8; const uint64_t lastIn = b.at<uint64_t>(ptr); ptr += 8;
const uint64_t lastTrustEstablishedPacketReceived = b.at<uint64_t>(ptr); ptr += 8; const uint64_t lastTrustEstablishedPacketReceived = b.at<uint64_t>(ptr); ptr += 8;
const unsigned int distance = b.at<uint16_t>(ptr); ptr += 2;
InetAddress addr,localAddr; InetAddress addr,localAddr;
ptr += addr.deserialize(b,ptr); ptr += addr.deserialize(b,ptr);
ptr += localAddr.deserialize(b,ptr); ptr += localAddr.deserialize(b,ptr);
@ -529,8 +532,9 @@ bool Peer::applyStateUpdate(const void *data,unsigned int len)
case AF_INET6: p = &_v6Path; break; case AF_INET6: p = &_v6Path; break;
} }
if (p) { if (p) {
if ( ((p->p->address() != addr)||(p->p->localAddress() != localAddr)) && (p->p->distance() > distance) ) if ( (!p->p) || ((p->p->address() != addr)||(p->p->localAddress() != localAddr)) ) {
p->p = RR->topology->getPath(localAddr,addr); p->p = RR->topology->getPath(localAddr,addr);
}
p->lr = lr; p->lr = lr;
p->p->updateFromRemoteState(lastOut,lastIn,lastTrustEstablishedPacketReceived); p->p->updateFromRemoteState(lastOut,lastIn,lastTrustEstablishedPacketReceived);
} }
@ -538,22 +542,22 @@ bool Peer::applyStateUpdate(const void *data,unsigned int len)
} }
} }
_lastReceive = std::max(_lastReceive,b.at<uint64_t>(ptr)); ptr += 8; _lastReceive = std::max(_lastReceive,ts - ((uint64_t)b.at<uint16_t>(ptr) * 100ULL)); ptr += 2;
_lastNontrivialReceive = std::max(_lastNontrivialReceive,b.at<uint64_t>(ptr)); ptr += 8; _lastNontrivialReceive = std::max(_lastNontrivialReceive,ts - ((uint64_t)b.at<uint16_t>(ptr) * 100ULL)); ptr += 2;
_lastTriedMemorizedPath = std::max(_lastTriedMemorizedPath,b.at<uint64_t>(ptr)); ptr += 8; _lastTriedMemorizedPath = std::max(_lastTriedMemorizedPath,ts - ((uint64_t)b.at<uint16_t>(ptr) * 100ULL)); ptr += 2;
_lastDirectPathPushSent = std::max(_lastDirectPathPushSent,b.at<uint64_t>(ptr)); ptr += 8; _lastDirectPathPushSent = std::max(_lastDirectPathPushSent,ts - ((uint64_t)b.at<uint16_t>(ptr) * 100ULL)); ptr += 2;
_lastDirectPathPushReceive = std::max(_lastDirectPathPushReceive,b.at<uint64_t>(ptr)); ptr += 8; _lastDirectPathPushReceive = std::max(_lastDirectPathPushReceive,ts - ((uint64_t)b.at<uint16_t>(ptr) * 100ULL)); ptr += 2;
_lastCredentialRequestSent = std::max(_lastCredentialRequestSent,b.at<uint64_t>(ptr)); ptr += 8; _lastCredentialRequestSent = std::max(_lastCredentialRequestSent,ts - ((uint64_t)b.at<uint16_t>(ptr) * 100ULL)); ptr += 2;
_lastWhoisRequestReceived = std::max(_lastWhoisRequestReceived,b.at<uint64_t>(ptr)); ptr += 8; _lastWhoisRequestReceived = std::max(_lastWhoisRequestReceived,ts - ((uint64_t)b.at<uint16_t>(ptr) * 100ULL)); ptr += 2;
_lastEchoRequestReceived = std::max(_lastEchoRequestReceived,b.at<uint64_t>(ptr)); ptr += 8; _lastEchoRequestReceived = std::max(_lastEchoRequestReceived,ts - ((uint64_t)b.at<uint16_t>(ptr) * 100ULL)); ptr += 2;
_lastComRequestReceived = std::max(_lastComRequestReceived,b.at<uint64_t>(ptr)); ptr += 8; _lastComRequestReceived = std::max(_lastComRequestReceived,ts - ((uint64_t)b.at<uint16_t>(ptr) * 100ULL)); ptr += 2;
_lastComRequestSent = std::max(_lastComRequestSent,b.at<uint64_t>(ptr)); ptr += 8; _lastComRequestSent = std::max(_lastComRequestSent,ts - ((uint64_t)b.at<uint16_t>(ptr) * 100ULL)); ptr += 2;
_lastCredentialsReceived = std::max(_lastCredentialsReceived,b.at<uint64_t>(ptr)); ptr += 8; _lastCredentialsReceived = std::max(_lastCredentialsReceived,ts - ((uint64_t)b.at<uint16_t>(ptr) * 100ULL)); ptr += 2;
_lastTrustEstablishedPacketReceived = std::max(_lastTrustEstablishedPacketReceived,b.at<uint64_t>(ptr)); ptr += 8; _lastTrustEstablishedPacketReceived = std::max(_lastTrustEstablishedPacketReceived,ts - ((uint64_t)b.at<uint16_t>(ptr) * 100ULL)); ptr += 2;
_vProto = b.at<uint16_t>(ptr); ptr += 2; _vProto = (uint16_t)b[ptr++];
_vMajor = b.at<uint16_t>(ptr); ptr += 2; _vMajor = (uint16_t)b[ptr++];
_vMinor = b.at<uint16_t>(ptr); ptr += 2; _vMinor = (uint16_t)b[ptr++];
_vRevision = b.at<uint16_t>(ptr); ptr += 2; _vRevision = b.at<uint16_t>(ptr); ptr += 2;
_lastReceivedStateTimestamp = ts; _lastReceivedStateTimestamp = ts;
@ -563,4 +567,25 @@ bool Peer::applyStateUpdate(const void *data,unsigned int len)
return false; return false;
} }
SharedPtr<Peer> Peer::createFromStateUpdate(const RuntimeEnvironment *renv,void *tPtr,const void *data,unsigned int len)
{
try {
Identity id;
{
Buffer<ZT_PEER_MAX_SERIALIZED_STATE_SIZE> b(data,len);
unsigned int ptr = 0;
if (b[ptr++] != 1)
return SharedPtr<Peer>();
ptr += 8; // skip TS, don't care
id.deserialize(b,ptr);
}
if (id) {
const SharedPtr<Peer> p(new Peer(renv,renv->identity,id));
if (p->applyStateUpdate(data,len))
return renv->topology->addPeer(tPtr,p);
}
} catch ( ... ) {}
return SharedPtr<Peer>();
}
} // namespace ZeroTier } // namespace ZeroTier

16
node/Peer.hpp
View File

@ -51,6 +51,8 @@
#include "Mutex.hpp" #include "Mutex.hpp"
#include "NonCopyable.hpp" #include "NonCopyable.hpp"
#define ZT_PEER_MAX_SERIALIZED_STATE_SIZE (sizeof(Peer) + 32 + (sizeof(Path) * 2))
namespace ZeroTier { namespace ZeroTier {
/** /**
@ -194,9 +196,10 @@ public:
bool doPingAndKeepalive(void *tPtr,uint64_t now,int inetAddressFamily); bool doPingAndKeepalive(void *tPtr,uint64_t now,int inetAddressFamily);
/** /**
* Write current peer state to external storage / cluster network * Write object state to external storage and/or cluster network
* *
* @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call * @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
* @param now Current time
*/ */
void writeState(void *tPtr,const uint64_t now); void writeState(void *tPtr,const uint64_t now);
@ -437,6 +440,17 @@ public:
return false; return false;
} }
/**
* Create a peer from a remote state update
*
* @param renv Runtime environment
* @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
* @param data State update data
* @param len State update length
* @return Peer or NULL if data was invalid
*/
static SharedPtr<Peer> createFromStateUpdate(const RuntimeEnvironment *renv,void *tPtr,const void *data,unsigned int len);
private: private:
struct _PeerPath struct _PeerPath
{ {

19
node/RuntimeEnvironment.hpp
View File

@ -30,8 +30,8 @@
#include <string> #include <string>
#include "Constants.hpp" #include "Constants.hpp"
#include "Utils.hpp"
#include "Identity.hpp" #include "Identity.hpp"
#include "Mutex.hpp"
namespace ZeroTier { namespace ZeroTier {
@ -58,10 +58,13 @@ public:
,mc((Multicaster *)0) ,mc((Multicaster *)0)
,topology((Topology *)0) ,topology((Topology *)0)
,sa((SelfAwareness *)0) ,sa((SelfAwareness *)0)
#ifdef ZT_ENABLE_CLUSTER
,cluster((Cluster *)0)
#endif
{ {
Utils::getSecureRandom(&instanceId,sizeof(instanceId));
}
~RuntimeEnvironment()
{
Utils::burn(reinterpret_cast<void *>(const_cast<char *>(secretIdentityStr.data())),(unsigned int)secretIdentityStr.length());
} }
// Node instance that owns this RuntimeEnvironment // Node instance that owns this RuntimeEnvironment
@ -87,9 +90,11 @@ public:
Multicaster *mc; Multicaster *mc;
Topology *topology; Topology *topology;
SelfAwareness *sa; SelfAwareness *sa;
#ifdef ZT_ENABLE_CLUSTER
Cluster *cluster; /**
#endif * A random integer identifying this run of ZeroTier
*/
uint32_t instanceId;
}; };
} // namespace ZeroTier } // namespace ZeroTier

83
node/Switch.cpp
View File

@ -108,13 +108,7 @@ void Switch::onRemotePacket(void *tPtr,const InetAddress &localAddr,const InetAd
const Address destination(fragment.destination()); const Address destination(fragment.destination());
if (destination != RR->identity.address()) { if (destination != RR->identity.address()) {
#ifdef ZT_ENABLE_CLUSTER if ( (!RR->topology->amRoot()) && (!path->trustEstablished(now)) )
const bool isClusterFrontplane = ((RR->cluster)&&(RR->cluster->isClusterPeerFrontplane(fromAddr)));
#else
const bool isClusterFrontplane = false;
#endif
if ( (!RR->topology->amRoot()) && (!path->trustEstablished(now)) && (!isClusterFrontplane) )
return; return;
if (fragment.hops() < ZT_RELAY_MAX_HOPS) { if (fragment.hops() < ZT_RELAY_MAX_HOPS) {
@ -124,13 +118,6 @@ void Switch::onRemotePacket(void *tPtr,const InetAddress &localAddr,const InetAd
// It wouldn't hurt anything, just redundant and unnecessary. // It wouldn't hurt anything, just redundant and unnecessary.
SharedPtr<Peer> relayTo = RR->topology->getPeer(tPtr,destination); SharedPtr<Peer> relayTo = RR->topology->getPeer(tPtr,destination);
if ((!relayTo)||(!relayTo->sendDirect(tPtr,fragment.data(),fragment.size(),now,false))) { if ((!relayTo)||(!relayTo->sendDirect(tPtr,fragment.data(),fragment.size(),now,false))) {
#ifdef ZT_ENABLE_CLUSTER
if ((RR->cluster)&&(!isClusterFrontplane)) {
RR->cluster->relayViaCluster(Address(),destination,fragment.data(),fragment.size(),false);
return;
}
#endif
// Don't know peer or no direct path -- so relay via someone upstream // Don't know peer or no direct path -- so relay via someone upstream
relayTo = RR->topology->getUpstreamPeer(); relayTo = RR->topology->getUpstreamPeer();
if (relayTo) if (relayTo)
@ -197,13 +184,8 @@ void Switch::onRemotePacket(void *tPtr,const InetAddress &localAddr,const InetAd
//TRACE("<< %.16llx %s -> %s (size: %u)",(unsigned long long)packet->packetId(),source.toString().c_str(),destination.toString().c_str(),packet->size()); //TRACE("<< %.16llx %s -> %s (size: %u)",(unsigned long long)packet->packetId(),source.toString().c_str(),destination.toString().c_str(),packet->size());
#ifdef ZT_ENABLE_CLUSTER
if ( (source == RR->identity.address()) && ((!RR->cluster)||(!RR->cluster->isClusterPeerFrontplane(fromAddr))) )
return;
#else
if (source == RR->identity.address()) if (source == RR->identity.address())
return; return;
#endif
if (destination != RR->identity.address()) { if (destination != RR->identity.address()) {
if ( (!RR->topology->amRoot()) && (!path->trustEstablished(now)) && (source != RR->identity.address()) ) if ( (!RR->topology->amRoot()) && (!path->trustEstablished(now)) && (source != RR->identity.address()) )
@ -212,12 +194,7 @@ void Switch::onRemotePacket(void *tPtr,const InetAddress &localAddr,const InetAd
Packet packet(data,len); Packet packet(data,len);
if (packet.hops() < ZT_RELAY_MAX_HOPS) { if (packet.hops() < ZT_RELAY_MAX_HOPS) {
#ifdef ZT_ENABLE_CLUSTER
if (source != RR->identity.address()) // don't increment hops for cluster frontplane relays
packet.incrementHops(); packet.incrementHops();
#else
packet.incrementHops();
#endif
SharedPtr<Peer> relayTo = RR->topology->getPeer(tPtr,destination); SharedPtr<Peer> relayTo = RR->topology->getPeer(tPtr,destination);
if ((relayTo)&&(relayTo->sendDirect(tPtr,packet.data(),packet.size(),now,false))) { if ((relayTo)&&(relayTo->sendDirect(tPtr,packet.data(),packet.size(),now,false))) {
@ -277,12 +254,6 @@ void Switch::onRemotePacket(void *tPtr,const InetAddress &localAddr,const InetAd
} }
} }
} else { } else {
#ifdef ZT_ENABLE_CLUSTER
if ((RR->cluster)&&(source != RR->identity.address())) {
RR->cluster->relayViaCluster(source,destination,packet.data(),packet.size(),_shouldUnite(now,source,destination));
return;
}
#endif
relayTo = RR->topology->getUpstreamPeer(&source,1,true); relayTo = RR->topology->getUpstreamPeer(&source,1,true);
if (relayTo) if (relayTo)
relayTo->sendDirect(tPtr,packet.data(),packet.size(),now,true); relayTo->sendDirect(tPtr,packet.data(),packet.size(),now,true);
@ -769,14 +740,6 @@ bool Switch::_trySend(void *tPtr,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
uint64_t clusterMostRecentTs = 0;
int clusterMostRecentMemberId = -1;
uint8_t clusterPeerSecret[ZT_PEER_SECRET_KEY_LENGTH];
if (RR->cluster)
clusterMostRecentMemberId = RR->cluster->checkSendViaCluster(destination,clusterMostRecentTs,clusterPeerSecret);
#endif
const SharedPtr<Peer> peer(RR->topology->getPeer(tPtr,destination)); const SharedPtr<Peer> peer(RR->topology->getPeer(tPtr,destination));
if (peer) { if (peer) {
/* First get the best path, and if it's dead (and this is not a root) /* First get the best path, and if it's dead (and this is not a root)
@ -788,74 +751,37 @@ bool Switch::_trySend(void *tPtr,Packet &packet,bool encrypt)
viaPath = peer->getBestPath(now,false); viaPath = peer->getBestPath(now,false);
if ( (viaPath) && (!viaPath->alive(now)) && (!RR->topology->isUpstream(peer->identity())) ) { if ( (viaPath) && (!viaPath->alive(now)) && (!RR->topology->isUpstream(peer->identity())) ) {
#ifdef ZT_ENABLE_CLUSTER
if ((clusterMostRecentMemberId < 0)||(viaPath->lastIn() > clusterMostRecentTs)) {
#endif
if ((now - viaPath->lastOut()) > std::max((now - viaPath->lastIn()) * 4,(uint64_t)ZT_PATH_MIN_REACTIVATE_INTERVAL)) { if ((now - viaPath->lastOut()) > std::max((now - viaPath->lastIn()) * 4,(uint64_t)ZT_PATH_MIN_REACTIVATE_INTERVAL)) {
peer->attemptToContactAt(tPtr,viaPath->localAddress(),viaPath->address(),now,false,viaPath->nextOutgoingCounter()); peer->attemptToContactAt(tPtr,viaPath->localAddress(),viaPath->address(),now,false,viaPath->nextOutgoingCounter());
viaPath->sent(now); viaPath->sent(now);
} }
#ifdef ZT_ENABLE_CLUSTER
}
#endif
viaPath.zero(); viaPath.zero();
} }
#ifdef ZT_ENABLE_CLUSTER
if (clusterMostRecentMemberId >= 0) {
if ((viaPath)&&(viaPath->lastIn() < clusterMostRecentTs))
viaPath.zero();
} else if (!viaPath) {
#else
if (!viaPath) { if (!viaPath) {
#endif
peer->tryMemorizedPath(tPtr,now); // periodically attempt memorized or statically defined paths, if any are known peer->tryMemorizedPath(tPtr,now); // periodically attempt memorized or statically defined paths, if any are known
const SharedPtr<Peer> relay(RR->topology->getUpstreamPeer()); const SharedPtr<Peer> relay(RR->topology->getUpstreamPeer());
if ( (!relay) || (!(viaPath = relay->getBestPath(now,false))) ) { if ( (!relay) || (!(viaPath = relay->getBestPath(now,false))) ) {
if (!(viaPath = peer->getBestPath(now,true))) if (!(viaPath = peer->getBestPath(now,true)))
return false; return false;
} }
#ifdef ZT_ENABLE_CLUSTER
} }
#else
}
#endif
} else { } else {
#ifdef ZT_ENABLE_CLUSTER
if (clusterMostRecentMemberId < 0) {
#else
requestWhois(tPtr,destination); requestWhois(tPtr,destination);
return false; // if we are not in cluster mode, there is no way we can send without knowing the peer directly return false; // if we are not in cluster mode, there is no way we can send without knowing the peer directly
#endif
#ifdef ZT_ENABLE_CLUSTER
}
#endif
} }
unsigned int chunkSize = std::min(packet.size(),(unsigned int)ZT_UDP_DEFAULT_PAYLOAD_MTU); unsigned int chunkSize = std::min(packet.size(),(unsigned int)ZT_UDP_DEFAULT_PAYLOAD_MTU);
packet.setFragmented(chunkSize < packet.size()); packet.setFragmented(chunkSize < packet.size());
#ifdef ZT_ENABLE_CLUSTER
const uint64_t trustedPathId = (viaPath) ? RR->topology->getOutboundPathTrust(viaPath->address()) : 0;
if (trustedPathId) {
packet.setTrusted(trustedPathId);
} else {
packet.armor((clusterMostRecentMemberId >= 0) ? clusterPeerSecret : peer->key(),encrypt,(viaPath) ? viaPath->nextOutgoingCounter() : 0);
}
#else
const uint64_t trustedPathId = RR->topology->getOutboundPathTrust(viaPath->address()); const uint64_t trustedPathId = RR->topology->getOutboundPathTrust(viaPath->address());
if (trustedPathId) { if (trustedPathId) {
packet.setTrusted(trustedPathId); packet.setTrusted(trustedPathId);
} else { } else {
packet.armor(peer->key(),encrypt,viaPath->nextOutgoingCounter()); packet.armor(peer->key(),encrypt,viaPath->nextOutgoingCounter());
} }
#endif
#ifdef ZT_ENABLE_CLUSTER
if ( ((viaPath)&&(viaPath->send(RR,tPtr,packet.data(),chunkSize,now))) || ((clusterMostRecentMemberId >= 0)&&(RR->cluster->sendViaCluster(clusterMostRecentMemberId,destination,packet.data(),chunkSize))) ) {
#else
if (viaPath->send(RR,tPtr,packet.data(),chunkSize,now)) { if (viaPath->send(RR,tPtr,packet.data(),chunkSize,now)) {
#endif
if (chunkSize < packet.size()) { if (chunkSize < packet.size()) {
// Too big for one packet, fragment the rest // Too big for one packet, fragment the rest
unsigned int fragStart = chunkSize; unsigned int fragStart = chunkSize;
@ -868,14 +794,7 @@ bool Switch::_trySend(void *tPtr,Packet &packet,bool encrypt)
for(unsigned int fno=1;fno<totalFragments;++fno) { for(unsigned int fno=1;fno<totalFragments;++fno) {
chunkSize = std::min(remaining,(unsigned int)(ZT_UDP_DEFAULT_PAYLOAD_MTU - ZT_PROTO_MIN_FRAGMENT_LENGTH)); chunkSize = std::min(remaining,(unsigned int)(ZT_UDP_DEFAULT_PAYLOAD_MTU - ZT_PROTO_MIN_FRAGMENT_LENGTH));
Packet::Fragment frag(packet,fragStart,chunkSize,fno,totalFragments); Packet::Fragment frag(packet,fragStart,chunkSize,fno,totalFragments);
#ifdef ZT_ENABLE_CLUSTER
if (viaPath)
viaPath->send(RR,tPtr,frag.data(),frag.size(),now); viaPath->send(RR,tPtr,frag.data(),frag.size(),now);
else if (clusterMostRecentMemberId >= 0)
RR->cluster->sendViaCluster(clusterMostRecentMemberId,destination,frag.data(),frag.size());
#else
viaPath->send(RR,tPtr,frag.data(),frag.size(),now);
#endif
fragStart += chunkSize; fragStart += chunkSize;
remaining -= chunkSize; remaining -= chunkSize;
} }

53
node/Topology.cpp
View File

@ -108,8 +108,6 @@ SharedPtr<Peer> Topology::addPeer(void *tPtr,const SharedPtr<Peer> &peer)
np = hp; np = hp;
} }
saveIdentity(tPtr,np->identity());
return np; return np;
} }
@ -128,18 +126,20 @@ SharedPtr<Peer> Topology::getPeer(void *tPtr,const Address &zta)
} }
try { try {
Identity id(_getIdentity(tPtr,zta)); char buf[ZT_PEER_MAX_SERIALIZED_STATE_SIZE];
if (id) { uint64_t idbuf[2]; idbuf[0] = zta.toInt(); idbuf[1] = 0;
SharedPtr<Peer> np(new Peer(RR,RR->identity,id)); int len = RR->node->stateObjectGet(tPtr,ZT_STATE_OBJECT_PEER_STATE,idbuf,buf,(unsigned int)sizeof(buf));
{ if (len > 0) {
Mutex::Lock _l(_peers_m); Mutex::Lock _l(_peers_m);
SharedPtr<Peer> &ap = _peers[zta]; SharedPtr<Peer> &ap = _peers[zta];
if (ap)
return ap;
ap = Peer::createFromStateUpdate(RR,tPtr,buf,len);
if (!ap) if (!ap)
ap.swap(np); _peers.erase(zta);
return ap; return ap;
} }
} } catch ( ... ) {} // ignore invalid identities or other strage failures
} catch ( ... ) {} // invalid identity on disk?
return SharedPtr<Peer>(); return SharedPtr<Peer>();
} }
@ -154,17 +154,7 @@ Identity Topology::getIdentity(void *tPtr,const Address &zta)
if (ap) if (ap)
return (*ap)->identity(); return (*ap)->identity();
} }
return _getIdentity(tPtr,zta); return Identity();
}
void Topology::saveIdentity(void *tPtr,const Identity &id)
{
if (id) {
const std::string tmp(id.toString(false));
uint64_t idtmp[2];
idtmp[0] = id.address().toInt(); idtmp[1] = 0;
RR->node->stateObjectPut(tPtr,ZT_STATE_OBJECT_PEER_IDENTITY,idtmp,tmp.data(),(unsigned int)tmp.length());
}
} }
SharedPtr<Peer> Topology::getUpstreamPeer(const Address *avoid,unsigned int avoidCount,bool strictAvoid) SharedPtr<Peer> Topology::getUpstreamPeer(const Address *avoid,unsigned int avoidCount,bool strictAvoid)
@ -423,21 +413,6 @@ void Topology::doPeriodicTasks(void *tPtr,uint64_t now)
} }
} }
Identity Topology::_getIdentity(void *tPtr,const Address &zta)
{
char tmp[512];
uint64_t idtmp[2];
idtmp[0] = zta.toInt(); idtmp[1] = 0;
int n = RR->node->stateObjectGet(tPtr,ZT_STATE_OBJECT_PEER_IDENTITY,idtmp,tmp,sizeof(tmp) - 1);
if (n > 0) {
tmp[n] = (char)0;
try {
return Identity(tmp);
} catch ( ... ) {} // ignore invalid IDs
}
return Identity();
}
void Topology::_memoizeUpstreams(void *tPtr) void Topology::_memoizeUpstreams(void *tPtr)
{ {
// assumes _upstreams_m and _peers_m are locked // assumes _upstreams_m and _peers_m are locked
@ -450,10 +425,8 @@ void Topology::_memoizeUpstreams(void *tPtr)
} else if (std::find(_upstreamAddresses.begin(),_upstreamAddresses.end(),i->identity.address()) == _upstreamAddresses.end()) { } else if (std::find(_upstreamAddresses.begin(),_upstreamAddresses.end(),i->identity.address()) == _upstreamAddresses.end()) {
_upstreamAddresses.push_back(i->identity.address()); _upstreamAddresses.push_back(i->identity.address());
SharedPtr<Peer> &hp = _peers[i->identity.address()]; SharedPtr<Peer> &hp = _peers[i->identity.address()];
if (!hp) { if (!hp)
hp = new Peer(RR,RR->identity,i->identity); hp = new Peer(RR,RR->identity,i->identity);
saveIdentity(tPtr,i->identity);
}
} }
} }
@ -464,10 +437,8 @@ void Topology::_memoizeUpstreams(void *tPtr)
} else if (std::find(_upstreamAddresses.begin(),_upstreamAddresses.end(),i->identity.address()) == _upstreamAddresses.end()) { } else if (std::find(_upstreamAddresses.begin(),_upstreamAddresses.end(),i->identity.address()) == _upstreamAddresses.end()) {
_upstreamAddresses.push_back(i->identity.address()); _upstreamAddresses.push_back(i->identity.address());
SharedPtr<Peer> &hp = _peers[i->identity.address()]; SharedPtr<Peer> &hp = _peers[i->identity.address()];
if (!hp) { if (!hp)
hp = new Peer(RR,RR->identity,i->identity); hp = new Peer(RR,RR->identity,i->identity);
saveIdentity(tPtr,i->identity);
}
} }
} }
} }

27
node/Topology.hpp
View File

@ -81,6 +81,13 @@ public:
*/ */
SharedPtr<Peer> getPeer(void *tPtr,const Address &zta); SharedPtr<Peer> getPeer(void *tPtr,const Address &zta);
/**
* @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
* @param zta ZeroTier address of peer
* @return Identity or NULL identity if not found
*/
Identity getIdentity(void *tPtr,const Address &zta);
/** /**
* Get a peer only if it is presently in memory (no disk cache) * Get a peer only if it is presently in memory (no disk cache)
* *
@ -116,26 +123,6 @@ public:
return p; return p;
} }
/**
* Get the identity of a peer
*
* @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
* @param zta ZeroTier address of peer
* @return Identity or NULL Identity if not found
*/
Identity getIdentity(void *tPtr,const Address &zta);
/**
* Cache an identity
*
* This is done automatically on addPeer(), and so is only useful for
* cluster identity replication.
*
* @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
* @param id Identity to cache
*/
void saveIdentity(void *tPtr,const Identity &id);
/** /**
* Get the current best upstream peer * Get the current best upstream peer
* *

4
osdep/Binder.hpp
View File

@ -180,7 +180,7 @@ public:
const unsigned long pid = (unsigned long)getpid(); const unsigned long pid = (unsigned long)getpid();
// Get all device names // Get all device names
Utils::snprintf(fn,sizeof(fn),"/proc/%lu/net/dev",pid); Utils::ztsnprintf(fn,sizeof(fn),"/proc/%lu/net/dev",pid);
FILE *procf = fopen(fn,"r"); FILE *procf = fopen(fn,"r");
if (procf) { if (procf) {
while (fgets(tmp,sizeof(tmp),procf)) { while (fgets(tmp,sizeof(tmp),procf)) {
@ -196,7 +196,7 @@ public:
} }
// Get IPv6 addresses (and any device names we don't already know) // Get IPv6 addresses (and any device names we don't already know)
Utils::snprintf(fn,sizeof(fn),"/proc/%lu/net/if_inet6",pid); Utils::ztsnprintf(fn,sizeof(fn),"/proc/%lu/net/if_inet6",pid);
procf = fopen(fn,"r"); procf = fopen(fn,"r");
if (procf) { if (procf) {
while (fgets(tmp,sizeof(tmp),procf)) { while (fgets(tmp,sizeof(tmp),procf)) {

80
service/OneService.cpp
View File

@ -154,9 +154,6 @@ namespace ZeroTier { typedef BSDEthernetTap EthernetTap; }
// How often to check for local interface addresses // How often to check for local interface addresses
#define ZT_LOCAL_INTERFACE_CHECK_INTERVAL 60000 #define ZT_LOCAL_INTERFACE_CHECK_INTERVAL 60000
// Clean files from iddb.d that are older than this (60 days)
#define ZT_IDDB_CLEANUP_AGE 5184000000ULL
// Maximum write buffer size for outgoing TCP connections (sanity limit) // Maximum write buffer size for outgoing TCP connections (sanity limit)
#define ZT_TCP_MAX_WRITEQ_SIZE 33554432 #define ZT_TCP_MAX_WRITEQ_SIZE 33554432
@ -414,7 +411,6 @@ public:
const std::string _homePath; const std::string _homePath;
std::string _authToken; std::string _authToken;
std::string _controllerDbPath; std::string _controllerDbPath;
const std::string _iddbPath;
const std::string _networksPath; const std::string _networksPath;
const std::string _moonsPath; const std::string _moonsPath;
@ -513,7 +509,6 @@ public:
OneServiceImpl(const char *hp,unsigned int port) : OneServiceImpl(const char *hp,unsigned int port) :
_homePath((hp) ? hp : ".") _homePath((hp) ? hp : ".")
,_controllerDbPath(_homePath + ZT_PATH_SEPARATOR_S "controller.d") ,_controllerDbPath(_homePath + ZT_PATH_SEPARATOR_S "controller.d")
,_iddbPath(_homePath + ZT_PATH_SEPARATOR_S "iddb.d")
,_networksPath(_homePath + ZT_PATH_SEPARATOR_S "networks.d") ,_networksPath(_homePath + ZT_PATH_SEPARATOR_S "networks.d")
,_moonsPath(_homePath + ZT_PATH_SEPARATOR_S "moons.d") ,_moonsPath(_homePath + ZT_PATH_SEPARATOR_S "moons.d")
,_controller((EmbeddedNetworkController *)0) ,_controller((EmbeddedNetworkController *)0)
@ -732,6 +727,9 @@ public:
} }
#endif #endif
// Delete legacy iddb.d if present (cleanup)
OSUtils::rmDashRf((_homePath + ZT_PATH_SEPARATOR_S "iddb.d").c_str());
// Network controller is now enabled by default for desktop and server // Network controller is now enabled by default for desktop and server
_controller = new EmbeddedNetworkController(_node,_controllerDbPath.c_str()); _controller = new EmbeddedNetworkController(_node,_controllerDbPath.c_str());
_node->setNetconfMaster((void *)_controller); _node->setNetconfMaster((void *)_controller);
@ -781,7 +779,6 @@ public:
uint64_t lastBindRefresh = 0; uint64_t lastBindRefresh = 0;
uint64_t lastUpdateCheck = clockShouldBe; uint64_t lastUpdateCheck = clockShouldBe;
uint64_t lastLocalInterfaceAddressCheck = (clockShouldBe - ZT_LOCAL_INTERFACE_CHECK_INTERVAL) + 15000; // do this in 15s to give portmapper time to configure and other things time to settle uint64_t lastLocalInterfaceAddressCheck = (clockShouldBe - ZT_LOCAL_INTERFACE_CHECK_INTERVAL) + 15000; // do this in 15s to give portmapper time to configure and other things time to settle
uint64_t lastCleanedIddb = 0;
uint64_t lastTcpCheck = 0; uint64_t lastTcpCheck = 0;
for(;;) { for(;;) {
_run_m.lock(); _run_m.lock();
@ -797,12 +794,6 @@ public:
const uint64_t now = OSUtils::now(); const uint64_t now = OSUtils::now();
// Clean iddb.d on start and every 24 hours
if ((now - lastCleanedIddb) > 86400000) {
lastCleanedIddb = now;
OSUtils::cleanDirectory(_iddbPath.c_str(),now - ZT_IDDB_CLEANUP_AGE);
}
// Attempt to detect sleep/wake events by detecting delay overruns // Attempt to detect sleep/wake events by detecting delay overruns
bool restarted = false; bool restarted = false;
if ((now > clockShouldBe)&&((now - clockShouldBe) > 10000)) { if ((now > clockShouldBe)&&((now - clockShouldBe) > 10000)) {
@ -1903,27 +1894,16 @@ public:
char *const outdata = const_cast<char *>(tc->writeq.data()) + startpos; char *const outdata = const_cast<char *>(tc->writeq.data()) + startpos;
encryptClusterMessage(outdata,mlen); encryptClusterMessage(outdata,mlen);
} tc->writeq.append(outdata,mlen);
void replicateStateObjectToCluster(const ZT_StateObjectType type,const uint64_t id[2],const void *const data,const unsigned int len,const uint64_t everyoneBut)
{
std::vector<uint64_t> sentTo;
if (everyoneBut)
sentTo.push_back(everyoneBut);
Mutex::Lock _l(_tcpConnections_m);
for(std::vector<TcpConnection *>::const_iterator ci(_tcpConnections.begin());ci!=_tcpConnections.end();++ci) {
TcpConnection *const c = *ci;
if ((c->type == TcpConnection::TCP_CLUSTER_BACKPLANE)&&(c->clusterMemberId != 0)&&(std::find(sentTo.begin(),sentTo.end(),c->clusterMemberId) == sentTo.end())) {
sentTo.push_back(c->clusterMemberId);
replicateStateObject(type,id,data,len,c);
}
}
} }
void writeStateObject(enum ZT_StateObjectType type,const uint64_t id[2],const void *data,int len) void writeStateObject(enum ZT_StateObjectType type,const uint64_t id[2],const void *data,int len)
{ {
char p[4096]; char buf[65535];
char p[1024];
FILE *f;
bool secure = false; bool secure = false;
switch(type) { switch(type) {
case ZT_STATE_OBJECT_IDENTITY_PUBLIC: case ZT_STATE_OBJECT_IDENTITY_PUBLIC:
Utils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "identity.public",_homePath.c_str()); Utils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "identity.public",_homePath.c_str());
@ -1932,13 +1912,14 @@ public:
Utils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "identity.secret",_homePath.c_str()); Utils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "identity.secret",_homePath.c_str());
secure = true; secure = true;
break; break;
case ZT_STATE_OBJECT_PEER_IDENTITY: //case ZT_STATE_OBJECT_PEER_STATE:
Utils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "iddb.d/%.10llx",_homePath.c_str(),(unsigned long long)id[0]); // break;
break;
case ZT_STATE_OBJECT_NETWORK_CONFIG: case ZT_STATE_OBJECT_NETWORK_CONFIG:
Utils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "networks.d/%.16llx.conf",_homePath.c_str(),(unsigned long long)id[0]); Utils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "networks.d/%.16llx.conf",_homePath.c_str(),(unsigned long long)id[0]);
secure = true; secure = true;
break; break;
//case ZT_STATE_OBJECT_NETWORK_MEMBERSHIP:
// break;
case ZT_STATE_OBJECT_PLANET: case ZT_STATE_OBJECT_PLANET:
Utils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "planet",_homePath.c_str()); Utils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "planet",_homePath.c_str());
break; break;
@ -1949,9 +1930,21 @@ public:
p[0] = (char)0; p[0] = (char)0;
break; break;
} }
if (p[0]) { if (p[0]) {
if (len >= 0) { if (len >= 0) {
FILE *f = fopen(p,"w"); // Check to see if we've already written this first. This reduces
// redundant writes and I/O overhead on most platforms and has
// little effect on others.
f = fopen(p,"r");
bool redundant = false;
if (f) {
long l = (long)fread(buf,1,sizeof(buf),f);
fclose(f);
redundant = ((l == (long)len)&&(memcmp(data,buf,l) == 0));
}
if (!redundant) {
f = fopen(p,"w");
if (f) { if (f) {
if (fwrite(data,len,1,f) != 1) if (fwrite(data,len,1,f) != 1)
fprintf(stderr,"WARNING: unable to write to file: %s (I/O error)" ZT_EOL_S,p); fprintf(stderr,"WARNING: unable to write to file: %s (I/O error)" ZT_EOL_S,p);
@ -1961,6 +1954,7 @@ public:
} else { } else {
fprintf(stderr,"WARNING: unable to write to file: %s (unable to open)" ZT_EOL_S,p); fprintf(stderr,"WARNING: unable to write to file: %s (unable to open)" ZT_EOL_S,p);
} }
}
} else { } else {
OSUtils::rm(p); OSUtils::rm(p);
} }
@ -2314,7 +2308,7 @@ public:
break; break;
case CLUSTER_MESSAGE_STATE_OBJECT: case CLUSTER_MESSAGE_STATE_OBJECT:
if (mlen >= 42) { // type + object ID + [data] if (mlen > 42) { // type + object ID + [data]
uint64_t objId[2]; uint64_t objId[2];
objId[0] = ( objId[0] = (
((uint64_t)data[26] << 56) | ((uint64_t)data[26] << 56) |
@ -2336,10 +2330,8 @@ public:
((uint64_t)data[40] << 8) | ((uint64_t)data[40] << 8) |
(uint64_t)data[41] (uint64_t)data[41]
); );
if (_node->processStateUpdate((void *)0,(ZT_StateObjectType)data[25],objId[0],data + 42,(unsigned int)(mlen - 42)) == ZT_RESULT_OK) { if (_node->processStateUpdate((void *)0,(ZT_StateObjectType)data[25],objId,data + 42,(unsigned int)(mlen - 42)) == ZT_RESULT_OK)
writeStateObject((ZT_StateObjectType)data[25],objId,data + 42,(unsigned int)(mlen - 42)); writeStateObject((ZT_StateObjectType)data[25],objId,data + 42,(unsigned int)(mlen - 42));
replicateStateObjectToCluster((ZT_StateObjectType)data[25],objId,data + 42,(unsigned int)(mlen - 42),tc->clusterMemberId);
}
} }
break; break;
@ -2558,7 +2550,18 @@ public:
inline void nodeStatePutFunction(enum ZT_StateObjectType type,const uint64_t id[2],const void *data,int len) inline void nodeStatePutFunction(enum ZT_StateObjectType type,const uint64_t id[2],const void *data,int len)
{ {
writeStateObject(type,id,data,len); writeStateObject(type,id,data,len);
replicateStateObjectToCluster(type,id,data,len,0);
std::vector<uint64_t> sentTo;
{
Mutex::Lock _l(_tcpConnections_m);
for(std::vector<TcpConnection *>::const_iterator ci(_tcpConnections.begin());ci!=_tcpConnections.end();++ci) {
TcpConnection *const c = *ci;
if ((c->type == TcpConnection::TCP_CLUSTER_BACKPLANE)&&(c->clusterMemberId != 0)&&(std::find(sentTo.begin(),sentTo.end(),c->clusterMemberId) == sentTo.end())) {
sentTo.push_back(c->clusterMemberId);
replicateStateObject(type,id,data,len,c);
}
}
}
} }
inline int nodeStateGetFunction(enum ZT_StateObjectType type,const uint64_t id[2],void *data,unsigned int maxlen) inline int nodeStateGetFunction(enum ZT_StateObjectType type,const uint64_t id[2],void *data,unsigned int maxlen)
@ -2571,9 +2574,6 @@ public:
case ZT_STATE_OBJECT_IDENTITY_SECRET: case ZT_STATE_OBJECT_IDENTITY_SECRET:
Utils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "identity.secret",_homePath.c_str()); Utils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "identity.secret",_homePath.c_str());
break; break;
case ZT_STATE_OBJECT_PEER_IDENTITY:
Utils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "iddb.d/%.10llx",_homePath.c_str(),(unsigned long long)id);
break;
case ZT_STATE_OBJECT_NETWORK_CONFIG: case ZT_STATE_OBJECT_NETWORK_CONFIG:
Utils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "networks.d/%.16llx.conf",_homePath.c_str(),(unsigned long long)id); Utils::ztsnprintf(p,sizeof(p),"%s" ZT_PATH_SEPARATOR_S "networks.d/%.16llx.conf",_homePath.c_str(),(unsigned long long)id);
break; break;