merge

2025-04-10 04:29:54 +00:00 · 2019-06-13 12:53:05 -07:00 · 2019-06-13 12:53:05 -07:00 · 9797540212
commit 9797540212
parent ce2338c24a 3b188ba672
8 changed files with 59 additions and 67 deletions
--- a/96
+++ b/96
@ -24,61 +24,61 @@ parallel 'centos7': {
            throw err
        }
    }
-}, 'android-ndk': {
-    node('android-ndk') {
-        try {
-            checkout scm
+// }, 'android-ndk': {
+//     node('android-ndk') {
+//         try {
+//             checkout scm
 	
-            stage('Build Android NDK') { 
-                sh "/android/android-ndk-r15b/ndk-build -C $WORKSPACE/java ZT1=${WORKSPACE}"
-            }
-        }
-        catch (err) {
-            currentBuild.result = "FAILURE"
-            mattermostSend color: '#ff0000', message: "${env.JOB_NAME} broken on Android NDK (<${env.BUILD_URL}|Open>)"
+//             stage('Build Android NDK') { 
+//                 sh "/android/android-ndk-r15b/ndk-build -C $WORKSPACE/java ZT1=${WORKSPACE}"
+//             }
+//         }
+//         catch (err) {
+//             currentBuild.result = "FAILURE"
+//             mattermostSend color: '#ff0000', message: "${env.JOB_NAME} broken on Android NDK (<${env.BUILD_URL}|Open>)"

-            throw err
-        }
-    }
-}, 'macOS': {
-    node('macOS') {
-        try {
-            checkout scm
+//             throw err
+//         }
+//     }
+// }, 'macOS': {
+//     node('macOS') {
+//         try {
+//             checkout scm

-            stage('Build macOS') {
-                sh 'make -f make-mac.mk'
-            }
+//             stage('Build macOS') {
+//                 sh 'make -f make-mac.mk'
+//             }

-            stage('Build macOS UI') {
-                sh 'cd macui && xcodebuild -target "ZeroTier One" -configuration Debug'
-            }
-        }
-        catch (err) {
-            currentBuild.result = "FAILURE"
-            mattermostSend color: '#ff0000', message: "${env.JOB_NAME} broken on macOS (<${env.BUILD_URL}|Open>)"
+//             stage('Build macOS UI') {
+//                 sh 'cd macui && xcodebuild -target "ZeroTier One" -configuration Debug'
+//             }
+//         }
+//         catch (err) {
+//             currentBuild.result = "FAILURE"
+//             mattermostSend color: '#ff0000', message: "${env.JOB_NAME} broken on macOS (<${env.BUILD_URL}|Open>)"

-            throw err
-        }
-    }
-}, 'windows': {
-    node('windows') {
-        try {
-            checkout scm
+//             throw err
+//         }
+//     }
+// }, 'windows': {
+//     node('windows') {
+//         try {
+//             checkout scm
            
-            stage('Build Windows') {
-                bat '''CALL "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat" amd64
-git clean -dfx
-msbuild windows\\ZeroTierOne.sln
-'''
-            }
-        }
-        catch (err) {
-            currentBuild.result = "FAILURE"
-            mattermostSend color: '#ff0000', message: "${env.JOB_NAME} broken on Windows (<${env.BUILD_URL}|Open>)"
+//             stage('Build Windows') {
+//                 bat '''CALL "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat" amd64
+// git clean -dfx
+// msbuild windows\\ZeroTierOne.sln
+// '''
+//             }
+//         }
+//         catch (err) {
+//             currentBuild.result = "FAILURE"
+//             mattermostSend color: '#ff0000', message: "${env.JOB_NAME} broken on Windows (<${env.BUILD_URL}|Open>)"

-            throw err
-        }
-    }
+//             throw err
+//         }
+//     }
 }

 mattermostSend color: "#00ff00", message: "${env.JOB_NAME} #${env.BUILD_NUMBER} Complete (<${env.BUILD_URL}|Show More...>)"
--- a/node/Node.cpp
+++ b/node/Node.cpp
@ -500,7 +500,7 @@ ZT_PeerList *Node::peers() const
 			p->paths[p->pathCount].trustedPathId = RR->topology->getOutboundPathTrust((*path)->address());
 			p->paths[p->pathCount].expired = 0;
 			p->paths[p->pathCount].preferred = ((*path) == bestp) ? 1 : 0;
-			p->paths[p->pathCount].latency = (*path)->latency();
+			p->paths[p->pathCount].latency = (float)(*path)->latency();
 			p->paths[p->pathCount].packetDelayVariance = (*path)->packetDelayVariance(); 
 			p->paths[p->pathCount].throughputDisturbCoeff = (*path)->throughputDisturbanceCoefficient();
 			p->paths[p->pathCount].packetErrorRatio = (*path)->packetErrorRatio();
--- a/node/Path.hpp
+++ b/node/Path.hpp
@ -351,7 +351,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 * 8) / ((float)timeSinceThroughputEstimate / (float)1000);
+			uint64_t throughput = (uint64_t)((float)(_bytesAckedSinceLastThroughputEstimation * 8) / ((float)timeSinceThroughputEstimate / (float)1000));
 			_throughputSamples.push(throughput);
 			_maxLifetimeThroughput = throughput > _maxLifetimeThroughput ? throughput : _maxLifetimeThroughput;
 			_lastThroughputEstimation = now;
@ -416,7 +416,7 @@ public:
 			if (it != _outQoSRecords.end()) {
 				uint16_t rtt = (uint16_t)(now - it->second);
 				uint16_t rtt_compensated = rtt - rx_ts[j];
-				float latency = rtt_compensated / 2.0;
+				uint16_t latency = rtt_compensated / 2;
 				updateLatency(latency, now);
 				_outQoSRecords.erase(it);
 			}
--- a/node/Peer.cpp
+++ b/node/Peer.cpp
@ -157,7 +157,7 @@ void Peer::received(
 						break;
 					}
 					// If the path is the same address and port, simply assume this is a replacement
-					if ( (_paths[i].p->address().ipsEqual2(path->address()) && (_paths[i].p->address().port() == path->address().port()))) {
+					if ( (_paths[i].p->address().ipsEqual2(path->address()))) {
 						replacePath = i;
 						break;
 					}
@ -285,7 +285,7 @@ void Peer::computeAggregateProportionalAllocation(int64_t now)
 	for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
 		if (_paths[i].p) {
 			relStability[i] = _paths[i].p->lastComputedStability();
-			relThroughput[i] = _paths[i].p->maxLifetimeThroughput();
+			relThroughput[i] = (float)_paths[i].p->maxLifetimeThroughput();
 			maxStability = relStability[i] > maxStability ? relStability[i] : maxStability;
 			maxThroughput = relThroughput[i] > maxThroughput ? relThroughput[i] : maxThroughput;
 			maxScope = _paths[i].p->ipScope() > maxScope ? _paths[i].p->ipScope() : maxScope;
@ -296,7 +296,7 @@ void Peer::computeAggregateProportionalAllocation(int64_t now)
 		if (_paths[i].p) {
 			relStability[i] /= maxStability ? maxStability : 1;
 			relThroughput[i] /= maxThroughput ? maxThroughput : 1;
-			float normalized_ma = Utils::normalize(_paths[i].p->ackAge(now), 0, ZT_PATH_MAX_AGE, 0, 10);
+			float normalized_ma = Utils::normalize((float)_paths[i].p->ackAge(now), 0, ZT_PATH_MAX_AGE, 0, 10);
 			float age_contrib = exp((-1)*normalized_ma);
 			float relScope = ((float)(_paths[i].p->ipScope()+1) / (maxScope + 1));
 			float relQuality =
@ -314,7 +314,7 @@ void Peer::computeAggregateProportionalAllocation(int64_t now)
 	// Convert set of relative performances into an allocation set
 	for(uint16_t i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
 		if (_paths[i].p) {
-			_paths[i].p->updateComponentAllocationOfAggregateLink((_paths[i].p->relativeQuality() / totalRelativeQuality) * 255);
+			_paths[i].p->updateComponentAllocationOfAggregateLink((unsigned char)((_paths[i].p->relativeQuality() / totalRelativeQuality) * 255));
 		}
 	}
 }
@ -327,7 +327,7 @@ int Peer::computeAggregateLinkPacketDelayVariance()
 			pdv += _paths[i].p->relativeQuality() * _paths[i].p->packetDelayVariance();
 		}
 	}
-	return pdv;
+	return (int)pdv;
 }

 int Peer::computeAggregateLinkMeanLatency()
@ -337,7 +337,7 @@ int Peer::computeAggregateLinkMeanLatency()
 	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();
+			ml += (int)(_paths[i].p->relativeQuality() * _paths[i].p->meanLatency());
 		}
 	}
 	return ml / pathCount;
--- a/node/RingBuffer.hpp
+++ b/node/RingBuffer.hpp
@ -268,7 +268,7 @@ public:
 		for (size_t i=0; i<curr_cnt; i++) {
 			iterator = (iterator + S - 1) % curr_cnt;
 			float deviation = (buf[i] - cached_mean);
-			sum_of_squared_deviations += (deviation*deviation);
+			sum_of_squared_deviations += (T)(deviation*deviation);
 		}
 		float variance = (float)sum_of_squared_deviations / (float)(S - 1);
 		return variance;
--- a/node/Switch.cpp
+++ b/node/Switch.cpp
@ -601,7 +601,7 @@ void Switch::aqm_enqueue(void *tPtr, const SharedPtr<Network> &network, Packet &

 uint64_t Switch::control_law(uint64_t t, int count)
 {
-	return t + ZT_QOS_INTERVAL / sqrt(count);
+	return (uint64_t)(t + ZT_QOS_INTERVAL / sqrt(count));
 }

 Switch::dqr Switch::dodequeue(ManagedQueue *q, uint64_t now) 
--- a/windows/ZeroTierOne/ZeroTierOne.vcxproj
+++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj
@ -30,7 +30,6 @@
    <ClCompile Include="..\..\controller\DB.cpp" />
    <ClCompile Include="..\..\controller\EmbeddedNetworkController.cpp" />
    <ClCompile Include="..\..\controller\FileDB.cpp" />
-    <ClCompile Include="..\..\controller\RethinkDB.cpp" />
    <ClCompile Include="..\..\ext\http-parser\http_parser.c" />
    <ClCompile Include="..\..\ext\libnatpmp\getgateway.c" />
    <ClCompile Include="..\..\ext\libnatpmp\natpmp.c" />
@ -115,7 +114,6 @@
    <ClInclude Include="..\..\controller\DB.hpp" />
    <ClInclude Include="..\..\controller\EmbeddedNetworkController.hpp" />
    <ClInclude Include="..\..\controller\FileDB.hpp" />
-    <ClInclude Include="..\..\controller\RethinkDB.hpp" />
    <ClInclude Include="..\..\ext\http-parser\http_parser.h" />
    <ClInclude Include="..\..\ext\json\json.hpp" />
    <ClInclude Include="..\..\ext\libnatpmp\getgateway.h" />
--- a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
+++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
@ -258,9 +258,6 @@
    <ClCompile Include="..\..\controller\FileDB.cpp">
      <Filter>Source Files\controller</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\controller\RethinkDB.cpp">
-      <Filter>Source Files\controller</Filter>
-    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="resource.h">
@ -494,9 +491,6 @@
    <ClInclude Include="..\..\controller\FileDB.hpp">
      <Filter>Header Files\controller</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\controller\RethinkDB.hpp">
-      <Filter>Header Files\controller</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\node\Membership.hpp">
      <Filter>Header Files\node</Filter>
    </ClInclude>