|
|
|
@ -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) { |
|
|
|
|