diff options
author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-10-29 09:39:36 -0700 |
---|---|---|
committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-10-29 09:39:36 -0700 |
commit | 883c84bdb95b0374e4f4ea2238b2288787547897 (patch) | |
tree | 538262634e83b8bb670d20c585271d0b1b851d00 /node | |
parent | e3d811b04b7fb04981d65a85d9042e2bd31798b7 (diff) | |
download | infinitytier-883c84bdb95b0374e4f4ea2238b2288787547897.tar.gz infinitytier-883c84bdb95b0374e4f4ea2238b2288787547897.zip |
Tweak some timings, and remove some dead code.
Diffstat (limited to 'node')
-rw-r--r-- | node/Cluster.hpp | 2 | ||||
-rw-r--r-- | node/Peer.hpp | 31 |
2 files changed, 1 insertions, 32 deletions
diff --git a/node/Cluster.hpp b/node/Cluster.hpp index cc9edd1d..0d8c0f15 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 39acffd9..e5db3bde 100644 --- a/node/Peer.hpp +++ b/node/Peer.hpp @@ -206,32 +206,6 @@ public: } /** - * @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 */ inline uint64_t lastReceive() const throw() { return _lastReceive; } @@ -286,11 +260,6 @@ public: } /** - * @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 */ |