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

Small amount of cleanup.

Browse source
This commit is contained in:
Adam Ierymenko 2015-11-06 11:15:06 -08:00
parent 3cafa60284
commit 8ea5f424fd
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
node/Cluster.cpp
View file

@ -216,22 +216,18 @@ void Cluster::handleIncomingStateMessage(const void *msg,unsigned int len)
const Address zeroTierAddress(dmsg.field(ptr,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH); ptr += ZT_ADDRESS_LENGTH; const Address zeroTierAddress(dmsg.field(ptr,ZT_ADDRESS_LENGTH),ZT_ADDRESS_LENGTH); ptr += ZT_ADDRESS_LENGTH;
InetAddress physicalAddress; InetAddress physicalAddress;
ptr += physicalAddress.deserialize(dmsg,ptr); ptr += physicalAddress.deserialize(dmsg,ptr);
// Forget any paths that we have to this peer at its address
if (physicalAddress) { if (physicalAddress) {
SharedPtr<Peer> myPeerRecord(RR->topology->getPeerNoCache(zeroTierAddress)); SharedPtr<Peer> myPeerRecord(RR->topology->getPeerNoCache(zeroTierAddress));
if (myPeerRecord) if (myPeerRecord)
myPeerRecord->removePathByAddress(physicalAddress); myPeerRecord->removePathByAddress(physicalAddress);
} }
// Set peer affinity to its new home
{ {
Mutex::Lock _l2(_peerAffinities_m); Mutex::Lock _l2(_peerAffinities_m);
_PA &pa = _peerAffinities[zeroTierAddress]; _PA &pa = _peerAffinities[zeroTierAddress];
pa.ts = RR->node->now(); pa.ts = RR->node->now();
pa.mid = fromMemberId; pa.mid = fromMemberId;
} }
TRACE("[%u] has %s @ %s",(unsigned int)fromMemberId,id.address().toString().c_str(),physicalAddress.toString().c_str()); TRACE("[%u] has %s @ %s",(unsigned int)fromMemberId,id.address().toString().c_str(),physicalAddress.toString().c_str());
} break; } break;
case STATE_MESSAGE_MULTICAST_LIKE: { case STATE_MESSAGE_MULTICAST_LIKE: {
@ -415,10 +411,12 @@ void Cluster::replicateHavePeer(const Identity &peerId,const InetAddress &physic
if (pa.mid != _id) { if (pa.mid != _id) {
pa.ts = now; pa.ts = now;
pa.mid = _id; pa.mid = _id;
// fall through to send code below
} else if ((now - pa.ts) < ZT_CLUSTER_HAVE_PEER_ANNOUNCE_PERIOD) { } else if ((now - pa.ts) < ZT_CLUSTER_HAVE_PEER_ANNOUNCE_PERIOD) {
return; return;
} else { } else {
pa.ts = now; pa.ts = now;
// fall through to send code below
} }
} }
@ -453,6 +451,7 @@ void Cluster::replicateMulticastLike(uint64_t nwid,const Address &peerAddress,co
void Cluster::replicateCertificateOfNetworkMembership(const CertificateOfMembership &com) void Cluster::replicateCertificateOfNetworkMembership(const CertificateOfMembership &com)
{ {
/* not used yet, so don't do this yet
Buffer<4096> buf; Buffer<4096> buf;
com.serialize(buf); com.serialize(buf);
TRACE("replicating %s COM for %.16llx to all members",com.issuedTo().toString().c_str(),com.networkId()); TRACE("replicating %s COM for %.16llx to all members",com.issuedTo().toString().c_str(),com.networkId());
@ -463,6 +462,7 @@ void Cluster::replicateCertificateOfNetworkMembership(const CertificateOfMembers
_send(*mid,STATE_MESSAGE_COM,buf.data(),buf.size()); _send(*mid,STATE_MESSAGE_COM,buf.data(),buf.size());
} }
} }
*/
} }
struct _ClusterAnnouncePeers struct _ClusterAnnouncePeers

4
node/Cluster.hpp
View file

@ -351,9 +351,9 @@ private:
struct _PA struct _PA
{ {
_PA() : ts(0),mid(0xffff) {} _PA() : ts(0),mid(0xffffffff) {}
uint64_t ts; uint64_t ts;
uint16_t mid; unsigned int mid;
}; };
Hashtable< Address,_PA > _peerAffinities; Hashtable< Address,_PA > _peerAffinities;
Mutex _peerAffinities_m; Mutex _peerAffinities_m;