ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-29 15:43:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#ifdef'd out multipath/QoS statistics buffers allocations for ZT_PROTOCOL_VERSION<10

Browse Source
This commit is contained in:
Joseph Henry 2019-03-01 13:28:00 -08:00
parent 59a0a25f35
commit 270debb3fc
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
node/Path.hpp
View File

@ -161,6 +161,7 @@ public:
~Path() ~Path()
{ {
#if ZT_PROTO_VERSION >= 10
delete _throughputSamples; delete _throughputSamples;
delete _latencySamples; delete _latencySamples;
delete _packetValiditySamples; delete _packetValiditySamples;
@ -169,6 +170,7 @@ public:
_latencySamples = NULL; _latencySamples = NULL;
_packetValiditySamples = NULL; _packetValiditySamples = NULL;
_throughputDisturbanceSamples = NULL; _throughputDisturbanceSamples = NULL;
#endif
} }
/** /**
@ -651,12 +653,14 @@ public:
* Initialize statistical buffers * Initialize statistical buffers
*/ */
inline void prepareBuffers() { inline void prepareBuffers() {
#if ZT_PROTO_VERSION >= 10
_throughputSamples = new RingBuffer<uint64_t>(ZT_PATH_QUALITY_METRIC_WIN_SZ); _throughputSamples = new RingBuffer<uint64_t>(ZT_PATH_QUALITY_METRIC_WIN_SZ);
_latencySamples = new RingBuffer<uint32_t>(ZT_PATH_QUALITY_METRIC_WIN_SZ); _latencySamples = new RingBuffer<uint32_t>(ZT_PATH_QUALITY_METRIC_WIN_SZ);
_packetValiditySamples = new RingBuffer<bool>(ZT_PATH_QUALITY_METRIC_WIN_SZ); _packetValiditySamples = new RingBuffer<bool>(ZT_PATH_QUALITY_METRIC_WIN_SZ);
_throughputDisturbanceSamples = new RingBuffer<float>(ZT_PATH_QUALITY_METRIC_WIN_SZ); _throughputDisturbanceSamples = new RingBuffer<float>(ZT_PATH_QUALITY_METRIC_WIN_SZ);
memset(_ifname, 0, 16); memset(_ifname, 0, 16);
memset(_addrString, 0, sizeof(_addrString)); memset(_addrString, 0, sizeof(_addrString));
#endif
} }
private: private:
@ -702,8 +706,6 @@ private:
float _lastComputedThroughputDistCoeff; float _lastComputedThroughputDistCoeff;
unsigned char _lastAllocation; unsigned char _lastAllocation;
// cached human-readable strings for tracing purposes // cached human-readable strings for tracing purposes
char _ifname[16]; char _ifname[16];
char _addrString[256]; char _addrString[256];

2
node/Peer.cpp
View File

@ -78,7 +78,9 @@ Peer::Peer(const RuntimeEnvironment *renv,const Identity &myIdentity,const Ident
Utils::getSecureRandom(&_freeRandomByte, 1); Utils::getSecureRandom(&_freeRandomByte, 1);
if (!myIdentity.agree(peerIdentity,_key,ZT_PEER_SECRET_KEY_LENGTH)) if (!myIdentity.agree(peerIdentity,_key,ZT_PEER_SECRET_KEY_LENGTH))
throw ZT_EXCEPTION_INVALID_ARGUMENT; throw ZT_EXCEPTION_INVALID_ARGUMENT;
#if ZT_PROTO_VERSION >= 10
_pathChoiceHist = new RingBuffer<int>(ZT_MULTIPATH_PROPORTION_WIN_SZ); _pathChoiceHist = new RingBuffer<int>(ZT_MULTIPATH_PROPORTION_WIN_SZ);
#endif
} }
void Peer::received( void Peer::received(

2
node/Peer.hpp
View File

@ -62,7 +62,9 @@ private:
public: public:
~Peer() { ~Peer() {
Utils::burn(_key,sizeof(_key)); Utils::burn(_key,sizeof(_key));
#if ZT_PROTO_VERSION >= 10
delete _pathChoiceHist; delete _pathChoiceHist;
#endif
_pathChoiceHist = NULL; _pathChoiceHist = NULL;
} }