ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-05-31 22:40:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up some credential push stuff.

Browse Source
This commit is contained in:
Adam Ierymenko 2022-04-19 16:06:53 -04:00
parent 877f86a896
commit cd70fefc5e
No known key found for this signature in database
GPG Key ID: C8877CF2D7A5D7F3
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/IncomingPacket.cpp
View File

@ -169,7 +169,7 @@ bool IncomingPacket::_doERROR(const RuntimeEnvironment *RR,void *tPtr,const Shar
const SharedPtr<Network> network(RR->node->network(networkId)); const SharedPtr<Network> network(RR->node->network(networkId));
const int64_t now = RR->node->now(); const int64_t now = RR->node->now();
if ((network)&&(network->config().com)) if ((network)&&(network->config().com))
network->pushCredentialsNow(tPtr,peer->address(),now); network->peerRequestedCredentials(tPtr,peer->address(),now);
} break; } break;
case Packet::ERROR_NETWORK_ACCESS_DENIED_: { case Packet::ERROR_NETWORK_ACCESS_DENIED_: {

10
node/Membership.hpp
View File

@ -64,15 +64,7 @@ public:
*/ */
void pushCredentials(const RuntimeEnvironment *RR,void *tPtr,const int64_t now,const Address &peerAddress,const NetworkConfig &nconf); void pushCredentials(const RuntimeEnvironment *RR,void *tPtr,const int64_t now,const Address &peerAddress,const NetworkConfig &nconf);
/** inline int64_t lastPushedCredentials() { return _lastPushedCredentials; }
* @param now Current time
* @param lastReceivedCredentials Time we last received updated credentials from the controller
* @return True if we haven't pushed credentials in a long time (to cause proactive credential push)
*/
inline bool shouldPushCredentials(const int64_t now, const int64_t lastReceivedCredentials) const
{
return ((now - _lastPushedCredentials) > ZT_PEER_ACTIVITY_TIMEOUT) || (lastReceivedCredentials > _lastPushedCredentials);
}
/** /**
* Check whether we should push MULTICAST_LIKEs to this peer, and update last sent time if true * Check whether we should push MULTICAST_LIKEs to this peer, and update last sent time if true

5
node/Network.hpp
View File

@ -372,7 +372,7 @@ public:
* @param to Destination peer address * @param to Destination peer address
* @param now Current time * @param now Current time
*/ */
inline void pushCredentialsNow(void *tPtr,const Address &to,const int64_t now) inline void peerRequestedCredentials(void *tPtr,const Address &to,const int64_t now)
{ {
Mutex::Lock _l(_lock); Mutex::Lock _l(_lock);
_membership(to).pushCredentials(RR,tPtr,now,to,_config); _membership(to).pushCredentials(RR,tPtr,now,to,_config);
@ -389,7 +389,8 @@ public:
{ {
Mutex::Lock _l(_lock); Mutex::Lock _l(_lock);
Membership &m = _membership(to); Membership &m = _membership(to);
if (m.shouldPushCredentials(now, _lastConfigUpdate)) const int64_t lastPushed = m.lastPushedCredentials();
if ((lastPushed < _lastConfigUpdate)||((now - lastPushed) > ZT_PEER_ACTIVITY_TIMEOUT))
m.pushCredentials(RR,tPtr,now,to,_config); m.pushCredentials(RR,tPtr,now,to,_config);
} }