diff options
| author | Grant Limberg <grant.limberg@zerotier.com> | 2019-03-11 09:44:40 -0700 |
|---|---|---|
| committer | Grant Limberg <grant.limberg@zerotier.com> | 2019-03-11 09:44:40 -0700 |
| commit | d4c0349de9546b31a0d029004ff8af92ab451a05 (patch) | |
| tree | 1cbc6ee4cfc31631461ea7fa68246950db992878 | |
| parent | 993d850f697dbedd5c8967f7fab482af923df926 (diff) | |
| download | infinitytier-d4c0349de9546b31a0d029004ff8af92ab451a05.tar.gz infinitytier-d4c0349de9546b31a0d029004ff8af92ab451a05.zip | |
Revert "#ifdef'd out multipath/QoS statistics buffers allocations for ZT_PROTOCOL_VERSION<10"
This reverts commit 270debb3fc39c3f1f6a3f6fbc2c5fb6183182c8f.
| -rw-r--r-- | node/Path.hpp | 6 | ||||
| -rw-r--r-- | node/Peer.cpp | 2 | ||||
| -rw-r--r-- | node/Peer.hpp | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/node/Path.hpp b/node/Path.hpp index 6acba172..a9e7d84d 100644 --- a/node/Path.hpp +++ b/node/Path.hpp @@ -161,7 +161,6 @@ public: ~Path() { -#if ZT_PROTO_VERSION >= 10 delete _throughputSamples; delete _latencySamples; delete _packetValiditySamples; @@ -170,7 +169,6 @@ public: _latencySamples = NULL; _packetValiditySamples = NULL; _throughputDisturbanceSamples = NULL; -#endif } /** @@ -653,14 +651,12 @@ public: * Initialize statistical buffers */ inline void prepareBuffers() { -#if ZT_PROTO_VERSION >= 10 _throughputSamples = new RingBuffer<uint64_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); _throughputDisturbanceSamples = new RingBuffer<float>(ZT_PATH_QUALITY_METRIC_WIN_SZ); memset(_ifname, 0, 16); memset(_addrString, 0, sizeof(_addrString)); -#endif } private: @@ -706,6 +702,8 @@ private: float _lastComputedThroughputDistCoeff; unsigned char _lastAllocation; + + // cached human-readable strings for tracing purposes char _ifname[16]; char _addrString[256]; diff --git a/node/Peer.cpp b/node/Peer.cpp index 9f8c5bbc..aecbd3a0 100644 --- a/node/Peer.cpp +++ b/node/Peer.cpp @@ -78,9 +78,7 @@ Peer::Peer(const RuntimeEnvironment *renv,const Identity &myIdentity,const Ident Utils::getSecureRandom(&_freeRandomByte, 1); if (!myIdentity.agree(peerIdentity,_key,ZT_PEER_SECRET_KEY_LENGTH)) throw ZT_EXCEPTION_INVALID_ARGUMENT; -#if ZT_PROTO_VERSION >= 10 _pathChoiceHist = new RingBuffer<int>(ZT_MULTIPATH_PROPORTION_WIN_SZ); -#endif } void Peer::received( diff --git a/node/Peer.hpp b/node/Peer.hpp index 99d3fac2..ae8f1e78 100644 --- a/node/Peer.hpp +++ b/node/Peer.hpp @@ -62,9 +62,7 @@ private: public: ~Peer() { Utils::burn(_key,sizeof(_key)); -#if ZT_PROTO_VERSION >= 10 delete _pathChoiceHist; -#endif _pathChoiceHist = NULL; } |