diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-09-08 19:48:05 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-09-08 19:48:05 -0700 |
| commit | 16df2c33631eeb3e123fefa4febf20f202fd476b (patch) | |
| tree | 209bbd61b04f17b494c9758f7bf2ff08450477ce /node/Membership.cpp | |
| parent | 1f6b13b7fdd8d1b79a754338d6ef4f30fd0d4064 (diff) | |
| download | infinitytier-16df2c33631eeb3e123fefa4febf20f202fd476b.tar.gz infinitytier-16df2c33631eeb3e123fefa4febf20f202fd476b.zip | |
Clean up handling of COMs, network access control, and fix a backward compatiblity issue.
Diffstat (limited to 'node/Membership.cpp')
| -rw-r--r-- | node/Membership.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/node/Membership.cpp b/node/Membership.cpp index 25ae1d9c..4ca008e3 100644 --- a/node/Membership.cpp +++ b/node/Membership.cpp @@ -24,13 +24,13 @@ #include "Packet.hpp" #include "Node.hpp" -#define ZT_CREDENTIAL_PUSH_EVERY (ZT_NETWORK_AUTOCONF_DELAY / 4) +#define ZT_CREDENTIAL_PUSH_EVERY (ZT_NETWORK_AUTOCONF_DELAY / 3) namespace ZeroTier { void Membership::sendCredentialsIfNeeded(const RuntimeEnvironment *RR,const uint64_t now,const Address &peerAddress,const NetworkConfig &nconf,const Capability *cap) { - if ((now - _lastPushAttempt) < 1000ULL) + if ((now - _lastPushAttempt) < 2000ULL) return; _lastPushAttempt = now; @@ -99,9 +99,11 @@ int Membership::addCredential(const RuntimeEnvironment *RR,const CertificateOfMe const int vr = com.verify(RR); if (vr == 0) { - TRACE("addCredential(CertificateOfMembership) for %s on %.16llx ACCEPTED (new)",com.issuedTo().toString().c_str(),com.networkId()); - if (com.timestamp().first > _com.timestamp().first) { + if (com.timestamp().first >= _com.timestamp().first) { + TRACE("addCredential(CertificateOfMembership) for %s on %.16llx ACCEPTED (new)",com.issuedTo().toString().c_str(),com.networkId()); _com = com; + } else { + TRACE("addCredential(CertificateOfMembership) for %s on %.16llx ACCEPTED but not used (OK but older than current)",com.issuedTo().toString().c_str(),com.networkId()); } } else { TRACE("addCredential(CertificateOfMembership) for %s on %.16llx REJECTED (%d)",com.issuedTo().toString().c_str(),com.networkId(),vr); |