diff options
| -rw-r--r-- | node/Cluster.cpp | 12 | ||||
| -rw-r--r-- | node/Cluster.hpp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/node/Cluster.cpp b/node/Cluster.cpp index 619f8d3e..e9c5856f 100644 --- a/node/Cluster.cpp +++ b/node/Cluster.cpp @@ -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; InetAddress physicalAddress; ptr += physicalAddress.deserialize(dmsg,ptr); - - // Forget any paths that we have to this peer at its address if (physicalAddress) { SharedPtr<Peer> myPeerRecord(RR->topology->getPeerNoCache(zeroTierAddress)); if (myPeerRecord) myPeerRecord->removePathByAddress(physicalAddress); } - - // Set peer affinity to its new home { Mutex::Lock _l2(_peerAffinities_m); _PA &pa = _peerAffinities[zeroTierAddress]; pa.ts = RR->node->now(); 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; case STATE_MESSAGE_MULTICAST_LIKE: { @@ -415,10 +411,12 @@ void Cluster::replicateHavePeer(const Identity &peerId,const InetAddress &physic if (pa.mid != _id) { pa.ts = now; pa.mid = _id; + // fall through to send code below } else if ((now - pa.ts) < ZT_CLUSTER_HAVE_PEER_ANNOUNCE_PERIOD) { return; } else { 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) { + /* not used yet, so don't do this yet Buffer<4096> buf; com.serialize(buf); 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()); } } + */ } struct _ClusterAnnouncePeers diff --git a/node/Cluster.hpp b/node/Cluster.hpp index 5b5d6d32..22297506 100644 --- a/node/Cluster.hpp +++ b/node/Cluster.hpp @@ -351,9 +351,9 @@ private: struct _PA { - _PA() : ts(0),mid(0xffff) {} + _PA() : ts(0),mid(0xffffffff) {} uint64_t ts; - uint16_t mid; + unsigned int mid; }; Hashtable< Address,_PA > _peerAffinities; Mutex _peerAffinities_m; |