diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-10-28 14:29:08 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-10-28 14:29:08 -0700 |
| commit | 68d6d3c4ff4d3921408f7d9bab3e31e0e028a871 (patch) | |
| tree | 00fe28018eeea7c76645cebfc0570f68757212d0 /node | |
| parent | 4c24e0cfb0bb9b61a4e19ac81b89dc1cbce6ea99 (diff) | |
| download | infinitytier-68d6d3c4ff4d3921408f7d9bab3e31e0e028a871.tar.gz infinitytier-68d6d3c4ff4d3921408f7d9bab3e31e0e028a871.zip | |
Fix bug in peer count.
Diffstat (limited to 'node')
| -rw-r--r-- | node/Cluster.cpp | 2 | ||||
| -rw-r--r-- | node/Topology.cpp | 4 | ||||
| -rw-r--r-- | node/Topology.hpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/node/Cluster.cpp b/node/Cluster.cpp index 9b034822..e95f6acc 100644 --- a/node/Cluster.cpp +++ b/node/Cluster.cpp @@ -634,7 +634,7 @@ void Cluster::status(ZT_ClusterStatus &status) const ms[_id]->x = _x; ms[_id]->y = _y; ms[_id]->z = _z; - ms[_id]->peers = RR->topology->countAlive(); + ms[_id]->peers = RR->topology->countActive(); for(std::vector<InetAddress>::const_iterator ep(_zeroTierPhysicalEndpoints.begin());ep!=_zeroTierPhysicalEndpoints.end();++ep) { if (ms[_id]->numZeroTierPhysicalEndpoints >= ZT_CLUSTER_MAX_ZT_PHYSICAL_ADDRESSES) // sanity check break; diff --git a/node/Topology.cpp b/node/Topology.cpp index 09668ef5..9027eff1 100644 --- a/node/Topology.cpp +++ b/node/Topology.cpp @@ -308,7 +308,7 @@ void Topology::clean(uint64_t now) } } -unsigned long Topology::countAlive() const +unsigned long Topology::countActive() const { const uint64_t now = RR->node->now(); unsigned long cnt = 0; @@ -317,7 +317,7 @@ unsigned long Topology::countAlive() const Address *a = (Address *)0; SharedPtr<Peer> *p = (SharedPtr<Peer> *)0; while (i.next(a,p)) { - if ((*p)->alive(now)) + if ((*p)->hasActiveDirectPath(now)) ++cnt; } return cnt; diff --git a/node/Topology.hpp b/node/Topology.hpp index 16836e07..b9f063c8 100644 --- a/node/Topology.hpp +++ b/node/Topology.hpp @@ -210,9 +210,9 @@ public: void clean(uint64_t now); /** - * @return Number of 'alive' peers + * @return Number of peers with active direct paths */ - unsigned long countAlive() const; + unsigned long countActive() const; /** * Apply a function or function object to all peers |