summaryrefslogtreecommitdiff
path: root/node
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2016-09-07 12:25:19 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2016-09-07 12:25:19 -0700
commit1c08f5e8578fa05975e9885212b6bd4583b397dc (patch)
tree5cb6a929e557c3fb7257b0c458947755ac8cb488 /node
parentc9ee8612e496d833b287f00c548f76ee5879bfef (diff)
downloadinfinitytier-1c08f5e8578fa05975e9885212b6bd4583b397dc.tar.gz
infinitytier-1c08f5e8578fa05975e9885212b6bd4583b397dc.zip
Tweak some expire times.
Diffstat (limited to 'node')
-rw-r--r--node/Membership.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/node/Membership.hpp b/node/Membership.hpp
index 209f6158..293fa4d8 100644
--- a/node/Membership.hpp
+++ b/node/Membership.hpp
@@ -32,10 +32,10 @@
#include "NetworkConfig.hpp"
// Expiration time for capability and tag cache
-#define ZT_MEMBERSHIP_STATE_EXPIRATION_TIME 600000
+#define ZT_MEMBERSHIP_STATE_EXPIRATION_TIME ZT_NETWORKCONFIG_DEFAULT_CREDENTIAL_TIME_MAX_MAX_DELTA
-// Expiration time for Memberships (used in Peer::clean())
-#define ZT_MEMBERSHIP_EXPIRATION_TIME (ZT_MEMBERSHIP_STATE_EXPIRATION_TIME * 2)
+// Expiration time for Memberships (used in Network::clean())
+#define ZT_MEMBERSHIP_EXPIRATION_TIME ZT_PEER_IN_MEMORY_EXPIRATION
namespace ZeroTier {