diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-05-21 19:14:49 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-05-21 19:14:49 -0700 |
| commit | c430d88bd40d178685ac0a2e648d8c4ea675996c (patch) | |
| tree | f69f497428fa34c6389173d39c889563dea9506c /node/Constants.hpp | |
| parent | 9a00366b18bc2bdb3ddf4345edcc7a459eb5ed60 (diff) | |
| parent | d9006712f6ffc975d97097caf2d2b4264405b32c (diff) | |
| download | infinitytier-c430d88bd40d178685ac0a2e648d8c4ea675996c.tar.gz infinitytier-c430d88bd40d178685ac0a2e648d8c4ea675996c.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Conflicts:
.gitignore
Diffstat (limited to 'node/Constants.hpp')
| -rw-r--r-- | node/Constants.hpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/node/Constants.hpp b/node/Constants.hpp index 3bda685d..1da10d11 100644 --- a/node/Constants.hpp +++ b/node/Constants.hpp @@ -270,11 +270,6 @@ #define ZT_NETWORK_AUTOCONF_DELAY 60000 /** - * Increment core desperation after this multiple of ping checks without responses from upstream peers - */ -#define ZT_CORE_DESPERATION_INCREMENT 2 - -/** * Timeout for overall peer activity (measured from last receive) */ #define ZT_PEER_ACTIVITY_TIMEOUT (ZT_PEER_DIRECT_PING_DELAY + (ZT_PING_CHECK_INVERVAL * 3)) |