void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 12:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Build fix.

Browse source
This commit is contained in:
Adam Ierymenko 2021-05-25 13:04:14 -04:00
parent 621898f3c5
commit 18508b5a2e
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
controller/EmbeddedNetworkController.cpp
View file

@ -1379,9 +1379,6 @@ void EmbeddedNetworkController::_request(
// If we made it this far, they are authorized (and authenticated). // If we made it this far, they are authorized (and authenticated).
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
nc->authenticationURL = authenticationURL;
nc->authenticationExpiryTime = authenticationExpiryTime;
int64_t credentialtmd = ZT_NETWORKCONFIG_DEFAULT_CREDENTIAL_TIME_MAX_MAX_DELTA; int64_t credentialtmd = ZT_NETWORKCONFIG_DEFAULT_CREDENTIAL_TIME_MAX_MAX_DELTA;
if (now > ns.mostRecentDeauthTime) { if (now > ns.mostRecentDeauthTime) {
// If we recently de-authorized a member, shrink credential TTL/max delta to // If we recently de-authorized a member, shrink credential TTL/max delta to
@ -1407,7 +1404,8 @@ void EmbeddedNetworkController::_request(
Utils::scopy(nc->name,sizeof(nc->name),OSUtils::jsonString(network["name"],"").c_str()); Utils::scopy(nc->name,sizeof(nc->name),OSUtils::jsonString(network["name"],"").c_str());
nc->mtu = std::max(std::min((unsigned int)OSUtils::jsonInt(network["mtu"],ZT_DEFAULT_MTU),(unsigned int)ZT_MAX_MTU),(unsigned int)ZT_MIN_MTU); nc->mtu = std::max(std::min((unsigned int)OSUtils::jsonInt(network["mtu"],ZT_DEFAULT_MTU),(unsigned int)ZT_MAX_MTU),(unsigned int)ZT_MIN_MTU);
nc->multicastLimit = (unsigned int)OSUtils::jsonInt(network["multicastLimit"],32ULL); nc->multicastLimit = (unsigned int)OSUtils::jsonInt(network["multicastLimit"],32ULL);
nc->authenticationURL = authenticationURL;
nc->authenticationExpiryTime = authenticationExpiryTime;
std::string rtt(OSUtils::jsonString(member["remoteTraceTarget"],"")); std::string rtt(OSUtils::jsonString(member["remoteTraceTarget"],""));
if (rtt.length() == 10) { if (rtt.length() == 10) {