diff options
| author | Grant Limberg <glimberg@gmail.com> | 2016-09-08 17:45:46 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2016-09-08 17:45:46 -0700 |
| commit | 5ed5b22525b9233871e3fca8da2c9d77535afd7b (patch) | |
| tree | 0c39ab15dd1a9456a204e69e8d51eaaed2e8944d /node/Topology.cpp | |
| parent | dccca7df1a893dacc50a605d707917f579d05db9 (diff) | |
| parent | 8afdb0aa651fcad00d4eaa0d09d5b4d40bbfb864 (diff) | |
| download | infinitytier-5ed5b22525b9233871e3fca8da2c9d77535afd7b.tar.gz infinitytier-5ed5b22525b9233871e3fca8da2c9d77535afd7b.zip | |
Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev
Diffstat (limited to 'node/Topology.cpp')
| -rw-r--r-- | node/Topology.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/node/Topology.cpp b/node/Topology.cpp index c6d46dc5..6e2fd071 100644 --- a/node/Topology.cpp +++ b/node/Topology.cpp @@ -256,11 +256,8 @@ void Topology::clean(uint64_t now) Address *a = (Address *)0; SharedPtr<Peer> *p = (SharedPtr<Peer> *)0; while (i.next(a,p)) { - if (((now - (*p)->lastUsed()) >= ZT_PEER_IN_MEMORY_EXPIRATION)&&(std::find(_rootAddresses.begin(),_rootAddresses.end(),*a) == _rootAddresses.end())) { + if (((now - (*p)->lastUsed()) >= ZT_PEER_IN_MEMORY_EXPIRATION)&&(std::find(_rootAddresses.begin(),_rootAddresses.end(),*a) == _rootAddresses.end())) _peers.erase(*a); - } else { - (*p)->clean(now); - } } } { |