Clang-format!!!
This commit is contained in:
parent
f190df8621
commit
96ba1079b2
122 changed files with 41245 additions and 39820 deletions
282
node/Peer.hpp
282
node/Peer.hpp
|
@ -14,27 +14,26 @@
|
|||
#ifndef ZT_PEER_HPP
|
||||
#define ZT_PEER_HPP
|
||||
|
||||
#include <vector>
|
||||
#include <list>
|
||||
|
||||
#include "../include/ZeroTierOne.h"
|
||||
|
||||
#include "Constants.hpp"
|
||||
#include "RuntimeEnvironment.hpp"
|
||||
#include "Node.hpp"
|
||||
#include "Path.hpp"
|
||||
#include "AES.hpp"
|
||||
#include "Address.hpp"
|
||||
#include "Utils.hpp"
|
||||
#include "AtomicCounter.hpp"
|
||||
#include "Bond.hpp"
|
||||
#include "Constants.hpp"
|
||||
#include "Hashtable.hpp"
|
||||
#include "Identity.hpp"
|
||||
#include "InetAddress.hpp"
|
||||
#include "Packet.hpp"
|
||||
#include "SharedPtr.hpp"
|
||||
#include "AtomicCounter.hpp"
|
||||
#include "Hashtable.hpp"
|
||||
#include "Mutex.hpp"
|
||||
#include "Bond.hpp"
|
||||
#include "AES.hpp"
|
||||
#include "Metrics.hpp"
|
||||
#include "Mutex.hpp"
|
||||
#include "Node.hpp"
|
||||
#include "Packet.hpp"
|
||||
#include "Path.hpp"
|
||||
#include "RuntimeEnvironment.hpp"
|
||||
#include "SharedPtr.hpp"
|
||||
#include "Utils.hpp"
|
||||
|
||||
#include <list>
|
||||
#include <vector>
|
||||
|
||||
#define ZT_PEER_MAX_SERIALIZED_STATE_SIZE (sizeof(Peer) + 32 + (sizeof(Path) * 2))
|
||||
|
||||
|
@ -43,19 +42,19 @@ namespace ZeroTier {
|
|||
/**
|
||||
* Peer on P2P Network (virtual layer 1)
|
||||
*/
|
||||
class Peer
|
||||
{
|
||||
class Peer {
|
||||
friend class SharedPtr<Peer>;
|
||||
friend class SharedPtr<Bond>;
|
||||
friend class Switch;
|
||||
friend class Bond;
|
||||
|
||||
private:
|
||||
Peer() = delete; // disabled to prevent bugs -- should not be constructed uninitialized
|
||||
private:
|
||||
Peer() = delete; // disabled to prevent bugs -- should not be constructed uninitialized
|
||||
|
||||
public:
|
||||
~Peer() {
|
||||
Utils::burn(_key,sizeof(_key));
|
||||
public:
|
||||
~Peer()
|
||||
{
|
||||
Utils::burn(_key, sizeof(_key));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -66,17 +65,23 @@ public:
|
|||
* @param peerIdentity Identity of peer
|
||||
* @throws std::runtime_error Key agreement with peer's identity failed
|
||||
*/
|
||||
Peer(const RuntimeEnvironment *renv,const Identity &myIdentity,const Identity &peerIdentity);
|
||||
Peer(const RuntimeEnvironment* renv, const Identity& myIdentity, const Identity& peerIdentity);
|
||||
|
||||
/**
|
||||
* @return This peer's ZT address (short for identity().address())
|
||||
*/
|
||||
inline const Address &address() const { return _id.address(); }
|
||||
inline const Address& address() const
|
||||
{
|
||||
return _id.address();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return This peer's identity
|
||||
*/
|
||||
inline const Identity &identity() const { return _id; }
|
||||
inline const Identity& identity() const
|
||||
{
|
||||
return _id;
|
||||
}
|
||||
|
||||
/**
|
||||
* Log receipt of an authenticated packet
|
||||
|
@ -95,8 +100,8 @@ public:
|
|||
* @param networkId Network ID if this pertains to a network, or 0 otherwise
|
||||
*/
|
||||
void received(
|
||||
void *tPtr,
|
||||
const SharedPtr<Path> &path,
|
||||
void* tPtr,
|
||||
const SharedPtr<Path>& path,
|
||||
const unsigned int hops,
|
||||
const uint64_t packetId,
|
||||
const unsigned int payloadLength,
|
||||
|
@ -114,15 +119,16 @@ public:
|
|||
* @param addr Remote address
|
||||
* @return True if we have an active path to this destination
|
||||
*/
|
||||
inline bool hasActivePathTo(int64_t now,const InetAddress &addr) const
|
||||
inline bool hasActivePathTo(int64_t now, const InetAddress& addr) const
|
||||
{
|
||||
Mutex::Lock _l(_paths_m);
|
||||
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
|
||||
for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
|
||||
if (_paths[i].p) {
|
||||
if (((now - _paths[i].lr) < ZT_PEER_PATH_EXPIRATION)&&(_paths[i].p->address() == addr)) {
|
||||
if (((now - _paths[i].lr) < ZT_PEER_PATH_EXPIRATION) && (_paths[i].p->address() == addr)) {
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -139,11 +145,11 @@ public:
|
|||
* @param force If true, send even if path is not alive
|
||||
* @return True if we actually sent something
|
||||
*/
|
||||
inline bool sendDirect(void *tPtr,const void *data,unsigned int len,int64_t now,bool force)
|
||||
inline bool sendDirect(void* tPtr, const void* data, unsigned int len, int64_t now, bool force)
|
||||
{
|
||||
SharedPtr<Path> bp(getAppropriatePath(now,force));
|
||||
SharedPtr<Path> bp(getAppropriatePath(now, force));
|
||||
if (bp) {
|
||||
return bp->send(RR,tPtr,data,len,now);
|
||||
return bp->send(RR, tPtr, data, len, now);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -159,8 +165,7 @@ public:
|
|||
* @param flowId Flow ID
|
||||
* @param now Current time
|
||||
*/
|
||||
void recordIncomingPacket(const SharedPtr<Path> &path, const uint64_t packetId,
|
||||
uint16_t payloadLength, const Packet::Verb verb, const int32_t flowId, int64_t now);
|
||||
void recordIncomingPacket(const SharedPtr<Path>& path, const uint64_t packetId, uint16_t payloadLength, const Packet::Verb verb, const int32_t flowId, int64_t now);
|
||||
|
||||
/**
|
||||
*
|
||||
|
@ -171,8 +176,7 @@ public:
|
|||
* @param flowId Flow ID
|
||||
* @param now Current time
|
||||
*/
|
||||
void recordOutgoingPacket(const SharedPtr<Path> &path, const uint64_t packetId,
|
||||
uint16_t payloadLength, const Packet::Verb verb, const int32_t flowId, int64_t now);
|
||||
void recordOutgoingPacket(const SharedPtr<Path>& path, const uint64_t packetId, uint16_t payloadLength, const Packet::Verb verb, const int32_t flowId, int64_t now);
|
||||
|
||||
/**
|
||||
* Record an invalid incoming packet. This packet failed
|
||||
|
@ -195,7 +199,7 @@ public:
|
|||
/**
|
||||
* Send VERB_RENDEZVOUS to this and another peer via the best common IP scope and path
|
||||
*/
|
||||
void introduce(void *const tPtr,const int64_t now,const SharedPtr<Peer> &other) const;
|
||||
void introduce(void* const tPtr, const int64_t now, const SharedPtr<Peer>& other) const;
|
||||
|
||||
/**
|
||||
* Send a HELLO to this peer at a specified physical address
|
||||
|
@ -207,7 +211,7 @@ public:
|
|||
* @param atAddress Destination address
|
||||
* @param now Current time
|
||||
*/
|
||||
void sendHELLO(void *tPtr,const int64_t localSocket,const InetAddress &atAddress,int64_t now);
|
||||
void sendHELLO(void* tPtr, const int64_t localSocket, const InetAddress& atAddress, int64_t now);
|
||||
|
||||
/**
|
||||
* Send ECHO (or HELLO for older peers) to this peer at the given address
|
||||
|
@ -220,7 +224,7 @@ public:
|
|||
* @param now Current time
|
||||
* @param sendFullHello If true, always send a full HELLO instead of just an ECHO
|
||||
*/
|
||||
void attemptToContactAt(void *tPtr,const int64_t localSocket,const InetAddress &atAddress,int64_t now,bool sendFullHello);
|
||||
void attemptToContactAt(void* tPtr, const int64_t localSocket, const InetAddress& atAddress, int64_t now, bool sendFullHello);
|
||||
|
||||
/**
|
||||
* Try a memorized or statically defined path if any are known
|
||||
|
@ -230,14 +234,14 @@ public:
|
|||
* @param tPtr Thread pointer to be handed through to any callbacks called as a result of this call
|
||||
* @param now Current time
|
||||
*/
|
||||
void tryMemorizedPath(void *tPtr,int64_t now);
|
||||
void tryMemorizedPath(void* tPtr, int64_t now);
|
||||
|
||||
/**
|
||||
* A check to be performed periodically which determines whether multipath communication is
|
||||
* possible with this peer. This check should be performed early in the life-cycle of the peer
|
||||
* as well as during the process of learning new paths.
|
||||
*/
|
||||
void performMultipathStateCheck(void *tPtr, int64_t now);
|
||||
void performMultipathStateCheck(void* tPtr, int64_t now);
|
||||
|
||||
/**
|
||||
* Send pings or keepalives depending on configured timeouts
|
||||
|
@ -249,7 +253,7 @@ public:
|
|||
* @param inetAddressFamily Keep this address family alive, or -1 for any
|
||||
* @return 0 if nothing sent or bit mask: bit 0x1 if IPv4 sent, bit 0x2 if IPv6 sent (0x3 means both sent)
|
||||
*/
|
||||
unsigned int doPingAndKeepalive(void *tPtr,int64_t now);
|
||||
unsigned int doPingAndKeepalive(void* tPtr, int64_t now);
|
||||
|
||||
/**
|
||||
* Process a cluster redirect sent by this peer
|
||||
|
@ -259,7 +263,7 @@ public:
|
|||
* @param remoteAddress Remote address
|
||||
* @param now Current time
|
||||
*/
|
||||
void clusterRedirect(void *tPtr,const SharedPtr<Path> &originatingPath,const InetAddress &remoteAddress,const int64_t now);
|
||||
void clusterRedirect(void* tPtr, const SharedPtr<Path>& originatingPath, const InetAddress& remoteAddress, const int64_t now);
|
||||
|
||||
/**
|
||||
* Reset paths within a given IP scope and address family
|
||||
|
@ -274,18 +278,18 @@ public:
|
|||
* @param inetAddressFamily Family e.g. AF_INET
|
||||
* @param now Current time
|
||||
*/
|
||||
void resetWithinScope(void *tPtr,InetAddress::IpScope scope,int inetAddressFamily,int64_t now);
|
||||
void resetWithinScope(void* tPtr, InetAddress::IpScope scope, int inetAddressFamily, int64_t now);
|
||||
|
||||
/**
|
||||
* @param now Current time
|
||||
* @return All known paths to this peer
|
||||
*/
|
||||
inline std::vector< SharedPtr<Path> > paths(const int64_t now) const
|
||||
inline std::vector<SharedPtr<Path> > paths(const int64_t now) const
|
||||
{
|
||||
std::vector< SharedPtr<Path> > pp;
|
||||
std::vector<SharedPtr<Path> > pp;
|
||||
Mutex::Lock _l(_paths_m);
|
||||
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
|
||||
if (!_paths[i].p) {
|
||||
for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
|
||||
if (! _paths[i].p) {
|
||||
break;
|
||||
}
|
||||
pp.push_back(_paths[i].p);
|
||||
|
@ -296,19 +300,31 @@ public:
|
|||
/**
|
||||
* @return Time of last receive of anything, whether direct or relayed
|
||||
*/
|
||||
inline int64_t lastReceive() const { return _lastReceive; }
|
||||
inline int64_t lastReceive() const
|
||||
{
|
||||
return _lastReceive;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return True if we've heard from this peer in less than ZT_PEER_ACTIVITY_TIMEOUT
|
||||
*/
|
||||
inline bool isAlive(const int64_t now) const { return ((now - _lastReceive) < ZT_PEER_ACTIVITY_TIMEOUT); }
|
||||
inline bool isAlive(const int64_t now) const
|
||||
{
|
||||
return ((now - _lastReceive) < ZT_PEER_ACTIVITY_TIMEOUT);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return True if this peer has sent us real network traffic recently
|
||||
*/
|
||||
inline int64_t isActive(int64_t now) const { return ((now - _lastNontrivialReceive) < ZT_PEER_ACTIVITY_TIMEOUT); }
|
||||
inline int64_t isActive(int64_t now) const
|
||||
{
|
||||
return ((now - _lastNontrivialReceive) < ZT_PEER_ACTIVITY_TIMEOUT);
|
||||
}
|
||||
|
||||
inline int64_t lastSentFullHello() { return _lastSentFullHello; }
|
||||
inline int64_t lastSentFullHello()
|
||||
{
|
||||
return _lastSentFullHello;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Latency in milliseconds of best/aggregate path or 0xffff if unknown / no paths
|
||||
|
@ -317,8 +333,9 @@ public:
|
|||
{
|
||||
if (_localMultipathSupported) {
|
||||
return (int)_lastComputedAggregateMeanLatency;
|
||||
} else {
|
||||
SharedPtr<Path> bp(getAppropriatePath(now,false));
|
||||
}
|
||||
else {
|
||||
SharedPtr<Path> bp(getAppropriatePath(now, false));
|
||||
if (bp) {
|
||||
return (unsigned int)bp->latency();
|
||||
}
|
||||
|
@ -344,7 +361,7 @@ public:
|
|||
return (~(unsigned int)0);
|
||||
}
|
||||
unsigned int l = latency(now);
|
||||
if (!l) {
|
||||
if (! l) {
|
||||
l = 0xffff;
|
||||
}
|
||||
return (l * (((unsigned int)tsr / (ZT_PEER_PING_PERIOD + 1000)) + 1));
|
||||
|
@ -353,7 +370,10 @@ public:
|
|||
/**
|
||||
* @return 256-bit secret symmetric encryption key
|
||||
*/
|
||||
inline const unsigned char *key() const { return _key; }
|
||||
inline const unsigned char* key() const
|
||||
{
|
||||
return _key;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the currently known remote version of this peer's client
|
||||
|
@ -363,7 +383,7 @@ public:
|
|||
* @param vmin Minor version
|
||||
* @param vrev Revision
|
||||
*/
|
||||
inline void setRemoteVersion(unsigned int vproto,unsigned int vmaj,unsigned int vmin,unsigned int vrev)
|
||||
inline void setRemoteVersion(unsigned int vproto, unsigned int vmaj, unsigned int vmin, unsigned int vrev)
|
||||
{
|
||||
_vProto = (uint16_t)vproto;
|
||||
_vMajor = (uint16_t)vmaj;
|
||||
|
@ -371,17 +391,35 @@ public:
|
|||
_vRevision = (uint16_t)vrev;
|
||||
}
|
||||
|
||||
inline unsigned int remoteVersionProtocol() const { return _vProto; }
|
||||
inline unsigned int remoteVersionMajor() const { return _vMajor; }
|
||||
inline unsigned int remoteVersionMinor() const { return _vMinor; }
|
||||
inline unsigned int remoteVersionRevision() const { return _vRevision; }
|
||||
inline unsigned int remoteVersionProtocol() const
|
||||
{
|
||||
return _vProto;
|
||||
}
|
||||
inline unsigned int remoteVersionMajor() const
|
||||
{
|
||||
return _vMajor;
|
||||
}
|
||||
inline unsigned int remoteVersionMinor() const
|
||||
{
|
||||
return _vMinor;
|
||||
}
|
||||
inline unsigned int remoteVersionRevision() const
|
||||
{
|
||||
return _vRevision;
|
||||
}
|
||||
|
||||
inline bool remoteVersionKnown() const { return ((_vMajor > 0)||(_vMinor > 0)||(_vRevision > 0)); }
|
||||
inline bool remoteVersionKnown() const
|
||||
{
|
||||
return ((_vMajor > 0) || (_vMinor > 0) || (_vRevision > 0));
|
||||
}
|
||||
|
||||
/**
|
||||
* @return True if peer has received a trust established packet (e.g. common network membership) in the past ZT_TRUST_EXPIRATION ms
|
||||
*/
|
||||
inline bool trustEstablished(const int64_t now) const { return ((now - _lastTrustEstablishedPacketReceived) < ZT_TRUST_EXPIRATION); }
|
||||
inline bool trustEstablished(const int64_t now) const
|
||||
{
|
||||
return ((now - _lastTrustEstablishedPacketReceived) < ZT_TRUST_EXPIRATION);
|
||||
}
|
||||
|
||||
/**
|
||||
* Rate limit gate for VERB_PUSH_DIRECT_PATHS
|
||||
|
@ -390,7 +428,8 @@ public:
|
|||
{
|
||||
if ((now - _lastDirectPathPushReceive) <= ZT_PUSH_DIRECT_PATHS_CUTOFF_TIME) {
|
||||
++_directPathPushCutoffCount;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
_directPathPushCutoffCount = 0;
|
||||
}
|
||||
_lastDirectPathPushReceive = now;
|
||||
|
@ -439,10 +478,10 @@ public:
|
|||
inline bool rateGateQoS(int64_t now, SharedPtr<Path>& path)
|
||||
{
|
||||
Mutex::Lock _l(_bond_m);
|
||||
if(_bond) {
|
||||
if (_bond) {
|
||||
return _bond->rateGateQoS(now, path);
|
||||
}
|
||||
return false; // Default behavior. If there is no bond, we drop these
|
||||
return false; // Default behavior. If there is no bond, we drop these
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -451,7 +490,7 @@ public:
|
|||
void receivedQoS(const SharedPtr<Path>& path, int64_t now, int count, uint64_t* rx_id, uint16_t* rx_ts)
|
||||
{
|
||||
Mutex::Lock _l(_bond_m);
|
||||
if(_bond) {
|
||||
if (_bond) {
|
||||
_bond->receivedQoS(path, now, count, rx_id, rx_ts);
|
||||
}
|
||||
}
|
||||
|
@ -462,7 +501,7 @@ public:
|
|||
void processIncomingPathNegotiationRequest(uint64_t now, SharedPtr<Path>& path, int16_t remoteUtility)
|
||||
{
|
||||
Mutex::Lock _l(_bond_m);
|
||||
if(_bond) {
|
||||
if (_bond) {
|
||||
_bond->processIncomingPathNegotiationRequest(now, path, remoteUtility);
|
||||
}
|
||||
}
|
||||
|
@ -473,10 +512,10 @@ public:
|
|||
inline bool rateGatePathNegotiation(int64_t now, SharedPtr<Path>& path)
|
||||
{
|
||||
Mutex::Lock _l(_bond_m);
|
||||
if(_bond) {
|
||||
if (_bond) {
|
||||
return _bond->rateGatePathNegotiation(now, path);
|
||||
}
|
||||
return false; // Default behavior. If there is no bond, we drop these
|
||||
return false; // Default behavior. If there is no bond, we drop these
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -485,7 +524,7 @@ public:
|
|||
bool flowHashingSupported()
|
||||
{
|
||||
Mutex::Lock _l(_bond_m);
|
||||
if(_bond) {
|
||||
if (_bond) {
|
||||
return _bond->flowHashingSupported();
|
||||
}
|
||||
return false;
|
||||
|
@ -496,8 +535,7 @@ public:
|
|||
*
|
||||
* This does not serialize everything, just non-ephemeral information.
|
||||
*/
|
||||
template<unsigned int C>
|
||||
inline void serializeForCache(Buffer<C> &b) const
|
||||
template <unsigned int C> inline void serializeForCache(Buffer<C>& b) const
|
||||
{
|
||||
b.append((uint8_t)2);
|
||||
|
||||
|
@ -511,22 +549,22 @@ public:
|
|||
{
|
||||
Mutex::Lock _l(_paths_m);
|
||||
unsigned int pc = 0;
|
||||
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
|
||||
for (unsigned int i = 0; i < ZT_MAX_PEER_NETWORK_PATHS; ++i) {
|
||||
if (_paths[i].p) {
|
||||
++pc;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
b.append((uint16_t)pc);
|
||||
for(unsigned int i=0;i<pc;++i) {
|
||||
for (unsigned int i = 0; i < pc; ++i) {
|
||||
_paths[i].p->address().serialize(b);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
template<unsigned int C>
|
||||
inline static SharedPtr<Peer> deserializeFromCache(int64_t now,void *tPtr,Buffer<C> &b,const RuntimeEnvironment *renv)
|
||||
template <unsigned int C> inline static SharedPtr<Peer> deserializeFromCache(int64_t now, void* tPtr, Buffer<C>& b, const RuntimeEnvironment* renv)
|
||||
{
|
||||
try {
|
||||
unsigned int ptr = 0;
|
||||
|
@ -535,12 +573,12 @@ public:
|
|||
}
|
||||
|
||||
Identity id;
|
||||
ptr += id.deserialize(b,ptr);
|
||||
if (!id) {
|
||||
ptr += id.deserialize(b, ptr);
|
||||
if (! id) {
|
||||
return SharedPtr<Peer>();
|
||||
}
|
||||
|
||||
SharedPtr<Peer> p(new Peer(renv,renv->identity,id));
|
||||
SharedPtr<Peer> p(new Peer(renv, renv->identity, id));
|
||||
|
||||
p->_vProto = b.template at<uint16_t>(ptr);
|
||||
ptr += 2;
|
||||
|
@ -556,20 +594,22 @@ public:
|
|||
// Paths are fairly ephemeral in the real world in most cases.
|
||||
const unsigned int tryPathCount = b.template at<uint16_t>(ptr);
|
||||
ptr += 2;
|
||||
for(unsigned int i=0;i<tryPathCount;++i) {
|
||||
for (unsigned int i = 0; i < tryPathCount; ++i) {
|
||||
InetAddress inaddr;
|
||||
try {
|
||||
ptr += inaddr.deserialize(b,ptr);
|
||||
ptr += inaddr.deserialize(b, ptr);
|
||||
if (inaddr) {
|
||||
p->attemptToContactAt(tPtr,-1,inaddr,now,true);
|
||||
p->attemptToContactAt(tPtr, -1, inaddr, now, true);
|
||||
}
|
||||
} catch ( ... ) {
|
||||
}
|
||||
catch (...) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return p;
|
||||
} catch ( ... ) {
|
||||
}
|
||||
catch (...) {
|
||||
return SharedPtr<Peer>();
|
||||
}
|
||||
}
|
||||
|
@ -577,12 +617,16 @@ public:
|
|||
/**
|
||||
* @return The bonding policy used to reach this peer
|
||||
*/
|
||||
SharedPtr<Bond> bond() { return _bond; }
|
||||
SharedPtr<Bond> bond()
|
||||
{
|
||||
return _bond;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return The bonding policy used to reach this peer
|
||||
*/
|
||||
inline int8_t bondingPolicy() {
|
||||
inline int8_t bondingPolicy()
|
||||
{
|
||||
Mutex::Lock _l(_bond_m);
|
||||
if (_bond) {
|
||||
return _bond->policy();
|
||||
|
@ -593,7 +637,8 @@ public:
|
|||
/**
|
||||
* @return the number of links in this bond which are considered alive
|
||||
*/
|
||||
inline uint8_t getNumAliveLinks() {
|
||||
inline uint8_t getNumAliveLinks()
|
||||
{
|
||||
Mutex::Lock _l(_paths_m);
|
||||
if (_bond) {
|
||||
return _bond->getNumAliveLinks();
|
||||
|
@ -604,7 +649,8 @@ public:
|
|||
/**
|
||||
* @return the number of links in this bond
|
||||
*/
|
||||
inline uint8_t getNumTotalLinks() {
|
||||
inline uint8_t getNumTotalLinks()
|
||||
{
|
||||
Mutex::Lock _l(_paths_m);
|
||||
if (_bond) {
|
||||
return _bond->getNumTotalLinks();
|
||||
|
@ -612,31 +658,36 @@ public:
|
|||
return 0;
|
||||
}
|
||||
|
||||
//inline const AES *aesKeysIfSupported() const
|
||||
// inline const AES *aesKeysIfSupported() const
|
||||
//{ return (const AES *)0; }
|
||||
|
||||
inline const AES *aesKeysIfSupported() const
|
||||
{ return (_vProto >= 12) ? _aesKeys : (const AES *)0; }
|
||||
|
||||
inline const AES *aesKeys() const
|
||||
{ return _aesKeys; }
|
||||
|
||||
private:
|
||||
struct _PeerPath
|
||||
inline const AES* aesKeysIfSupported() const
|
||||
{
|
||||
_PeerPath() : lr(0),p(),priority(1) {}
|
||||
int64_t lr; // time of last valid ZeroTier packet
|
||||
return (_vProto >= 12) ? _aesKeys : (const AES*)0;
|
||||
}
|
||||
|
||||
inline const AES* aesKeys() const
|
||||
{
|
||||
return _aesKeys;
|
||||
}
|
||||
|
||||
private:
|
||||
struct _PeerPath {
|
||||
_PeerPath() : lr(0), p(), priority(1)
|
||||
{
|
||||
}
|
||||
int64_t lr; // time of last valid ZeroTier packet
|
||||
SharedPtr<Path> p;
|
||||
long priority; // >= 1, higher is better
|
||||
long priority; // >= 1, higher is better
|
||||
};
|
||||
|
||||
uint8_t _key[ZT_SYMMETRIC_KEY_SIZE];
|
||||
AES _aesKeys[2];
|
||||
|
||||
const RuntimeEnvironment *RR;
|
||||
const RuntimeEnvironment* RR;
|
||||
|
||||
int64_t _lastReceive; // direct or indirect
|
||||
int64_t _lastNontrivialReceive; // frames, things like netconf, etc.
|
||||
int64_t _lastReceive; // direct or indirect
|
||||
int64_t _lastNontrivialReceive; // frames, things like netconf, etc.
|
||||
int64_t _lastTriedMemorizedPath;
|
||||
int64_t _lastDirectPathPushSent;
|
||||
int64_t _lastDirectPathPushReceive;
|
||||
|
@ -654,7 +705,7 @@ private:
|
|||
uint16_t _vMinor;
|
||||
uint16_t _vRevision;
|
||||
|
||||
std::list< std::pair< Path *, int64_t > > _lastTriedPath;
|
||||
std::list<std::pair<Path*, int64_t> > _lastTriedPath;
|
||||
Mutex _lastTriedPath_m;
|
||||
|
||||
_PeerPath _paths[ZT_MAX_PEER_NETWORK_PATHS];
|
||||
|
@ -679,7 +730,7 @@ private:
|
|||
SharedPtr<Bond> _bond;
|
||||
|
||||
#ifndef ZT_NO_PEER_METRICS
|
||||
prometheus::Histogram<uint64_t> &_peer_latency;
|
||||
prometheus::Histogram<uint64_t>& _peer_latency;
|
||||
prometheus::simpleapi::gauge_metric_t _alive_path_count;
|
||||
prometheus::simpleapi::gauge_metric_t _dead_path_count;
|
||||
prometheus::simpleapi::counter_metric_t _incoming_packet;
|
||||
|
@ -688,15 +739,14 @@ private:
|
|||
#endif
|
||||
};
|
||||
|
||||
} // namespace ZeroTier
|
||||
} // namespace ZeroTier
|
||||
|
||||
// Add a swap() for shared ptr's to peers to speed up peer sorts
|
||||
namespace std {
|
||||
template<>
|
||||
inline void swap(ZeroTier::SharedPtr<ZeroTier::Peer> &a,ZeroTier::SharedPtr<ZeroTier::Peer> &b)
|
||||
{
|
||||
a.swap(b);
|
||||
}
|
||||
template <> inline void swap(ZeroTier::SharedPtr<ZeroTier::Peer>& a, ZeroTier::SharedPtr<ZeroTier::Peer>& b)
|
||||
{
|
||||
a.swap(b);
|
||||
}
|
||||
} // namespace std
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue