ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-02 03:06:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make activity no longer a function of ping frequency, since this causes compatibility bugs when the latter was modified due to timer interactions with other versions.

Browse Source
This commit is contained in:
Adam Ierymenko 2016-02-08 10:03:01 -08:00
parent a963810e02
commit 63ec7e58d4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
node/Constants.hpp
View File

@ -260,7 +260,12 @@
/** /**
* Timeout for overall peer activity (measured from last receive) * Timeout for overall peer activity (measured from last receive)
*/ */
#define ZT_PEER_ACTIVITY_TIMEOUT ((ZT_PEER_DIRECT_PING_DELAY * 4) + ZT_PING_CHECK_INVERVAL) #define ZT_PEER_ACTIVITY_TIMEOUT 500000
/**
* Timeout for path activity
*/
#define ZT_PATH_ACTIVITY_TIMEOUT ZT_PEER_ACTIVITY_TIMEOUT
/** /**
* No answer timeout to trigger dead path detection * No answer timeout to trigger dead path detection

2
node/Path.hpp
View File

@ -127,7 +127,7 @@ public:
inline bool active(uint64_t now) const inline bool active(uint64_t now) const
throw() throw()
{ {
return (((now - _lastReceived) < ZT_PEER_ACTIVITY_TIMEOUT)&&(_probation < ZT_PEER_DEAD_PATH_DETECTION_MAX_PROBATION)); return (((now - _lastReceived) < ZT_PATH_ACTIVITY_TIMEOUT)&&(_probation < ZT_PEER_DEAD_PATH_DETECTION_MAX_PROBATION));
} }
/** /**