Fixed aggregateLinkLatency(). Also changed unit for throughput from byte to bit

node/Path.hpp

@@ -365,7 +365,7 @@ public:
 		_unackedBytes = (ackedBytes > _unackedBytes) ? 0 : _unackedBytes - ackedBytes;
 		int64_t timeSinceThroughputEstimate = (now - _lastThroughputEstimation);
 		if (timeSinceThroughputEstimate >= ZT_PATH_THROUGHPUT_MEASUREMENT_INTERVAL) {
-			uint64_t throughput = (float)(_bytesAckedSinceLastThroughputEstimation) / ((float)timeSinceThroughputEstimate / (float)1000);
+			uint64_t throughput = (float)(_bytesAckedSinceLastThroughputEstimation * 8) / ((float)timeSinceThroughputEstimate / (float)1000);
 			_throughputSamples->push(throughput);
 			_maxLifetimeThroughput = throughput > _maxLifetimeThroughput ? throughput : _maxLifetimeThroughput;
 			_lastThroughputEstimation = now;

node/Peer.cpp

@@ -349,12 +349,14 @@ float Peer::computeAggregateLinkPacketDelayVariance()
 float Peer::computeAggregateLinkMeanLatency()
 {
 	float ml = 0.0;
+	int pathCount = 0;
 	for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
 		if (_paths[i].p) {
+			pathCount++;
 			ml += _paths[i].p->relativeQuality() * _paths[i].p->meanLatency();
 		}
 	}
-	return ml;
+	return ml / pathCount;
 }
 
 int Peer::aggregateLinkPhysicalPathCount()