Fix bug in peer count.

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;

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;

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