From 883c84bdb95b0374e4f4ea2238b2288787547897 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Thu, 29 Oct 2015 09:39:36 -0700
Subject: [PATCH] Tweak some timings, and remove some dead code.
---
node/Cluster.hpp | 2 +-
node/Peer.hpp | 31 -------------------------------
2 files changed, 1 insertion(+), 32 deletions(-)
diff --git a/node/Cluster.hpp b/node/Cluster.hpp
index cc9edd1d1..0d8c0f155 100644
--- a/node/Cluster.hpp
+++ b/node/Cluster.hpp
@@ -57,7 +57,7 @@
/**
* Desired period between doPeriodicTasks() in milliseconds
*/
-#define ZT_CLUSTER_PERIODIC_TASK_PERIOD 250
+#define ZT_CLUSTER_PERIODIC_TASK_PERIOD 100
namespace ZeroTier {
diff --git a/node/Peer.hpp b/node/Peer.hpp
index 39acffd97..e5db3bde5 100644
--- a/node/Peer.hpp
+++ b/node/Peer.hpp
@@ -205,32 +205,6 @@ public:
return pp;
}
- /**
- * @return Time of last direct packet receive for any path
- */
- inline uint64_t lastDirectReceive() const
- throw()
- {
- Mutex::Lock _l(_lock);
- uint64_t x = 0;
- for(unsigned int p=0,np=_numPaths;p<np;++p)
- x = std::max(x,_paths[p].lastReceived());
- return x;
- }
-
- /**
- * @return Time of last direct packet send for any path
- */
- inline uint64_t lastDirectSend() const
- throw()
- {
- Mutex::Lock _l(_lock);
- uint64_t x = 0;
- for(unsigned int p=0,np=_numPaths;p<np;++p)
- x = std::max(x,_paths[p].lastSend());
- return x;
- }
-
/**
* @return Time of last receive of anything, whether direct or relayed
*/
@@ -285,11 +259,6 @@ public:
else _latency = std::min(l,(unsigned int)65535);
}
- /**
- * @return True if this peer has at least one direct IP address path
- */
- inline bool hasDirectPath() const throw() { return (_numPaths != 0); }
-
/**
* @param now Current time
* @return True if this peer has at least one active direct path