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 /node/Path.hpp | |
| 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.
Diffstat (limited to 'node/Path.hpp')
| -rw-r--r-- | node/Path.hpp | 6 |
1 files changed, 2 insertions, 4 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]; |