void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert change to path quality to fix IPv6 issue in beta. We will rework this in 2.x.

Browse source
This commit is contained in:
Adam Ierymenko 2020-10-14 20:41:58 -04:00
parent 2c75be0d64
commit 8d83b9b7c5
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
node/Path.hpp
View file

@ -184,7 +184,8 @@ public:
* *
* @param t Time of receive * @param t Time of receive
*/ */
inline void received(const uint64_t t) { inline void received(const uint64_t t)
{
if (!alive(t,_bonded)) { if (!alive(t,_bonded)) {
_lastAliveToggle = _lastIn; _lastAliveToggle = _lastIn;
} }
@ -311,15 +312,9 @@ public:
*/ */
inline long quality(const int64_t now) const inline long quality(const int64_t now) const
{ {
const long l = (long)_latency; const int l = (long)_latency;
const long age = (long)std::min((now - _lastIn),(int64_t)(ZT_PATH_HEARTBEAT_PERIOD * 10)); // set an upper sanity limit to avoid overflow const int age = (long)std::min((now - _lastIn),(int64_t)(ZT_PATH_HEARTBEAT_PERIOD * 10)); // set an upper sanity limit to avoid overflow
return ( return (((age < (ZT_PATH_HEARTBEAT_PERIOD + 5000)) ? l : (l + 0xffff + age)) * (long)((ZT_INETADDRESS_MAX_SCOPE - _ipScope) + 1));
(
(age < (long)(ZT_PATH_HEARTBEAT_PERIOD + 5000)) ? l : (l + 0xffff + age)
) * (
((long)ZT_INETADDRESS_MAX_SCOPE - (long)_ipScope) + (_addr.isV6() ? (long)1 : (long)3)
)
);
} }
/** /**