diff options
| author | Grant Limberg <grant.limberg@zerotier.com> | 2017-10-04 12:01:17 -0700 |
|---|---|---|
| committer | Grant Limberg <grant.limberg@zerotier.com> | 2017-10-04 12:01:17 -0700 |
| commit | 099bedd2e925a489d59fd4ecca59813944887f5f (patch) | |
| tree | 47646d025ad804b9342f9e87f64c1f4de6086469 /node/Membership.cpp | |
| parent | 4177a115229fe9c3548f9df38d75a5dfdcaa754c (diff) | |
| download | infinitytier-099bedd2e925a489d59fd4ecca59813944887f5f.tar.gz infinitytier-099bedd2e925a489d59fd4ecca59813944887f5f.zip | |
A few more uint64_t -> int64_t changes for timestamps
Diffstat (limited to 'node/Membership.cpp')
| -rw-r--r-- | node/Membership.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/node/Membership.cpp b/node/Membership.cpp index 740f4e68..de5fb99d 100644 --- a/node/Membership.cpp +++ b/node/Membership.cpp @@ -155,7 +155,7 @@ Membership::AddCredentialResult Membership::addCredential(const RuntimeEnvironme // Template out addCredential() for many cred types to avoid copypasta template<typename C> -static Membership::AddCredentialResult _addCredImpl(Hashtable<uint32_t,C> &remoteCreds,const Hashtable<uint64_t,uint64_t> &revocations,const RuntimeEnvironment *RR,void *tPtr,const NetworkConfig &nconf,const C &cred) +static Membership::AddCredentialResult _addCredImpl(Hashtable<uint32_t,C> &remoteCreds,const Hashtable<uint64_t,int64_t> &revocations,const RuntimeEnvironment *RR,void *tPtr,const NetworkConfig &nconf,const C &cred) { C *rc = remoteCreds.get(cred.id()); if (rc) { @@ -167,7 +167,7 @@ static Membership::AddCredentialResult _addCredImpl(Hashtable<uint32_t,C> &remot return Membership::ADD_ACCEPTED_REDUNDANT; } - const uint64_t *const rt = revocations.get(Membership::credentialKey(C::credentialType(),cred.id())); + const int64_t *const rt = revocations.get(Membership::credentialKey(C::credentialType(),cred.id())); if ((rt)&&(*rt >= cred.timestamp())) { RR->t->credentialRejected(tPtr,cred,"revoked"); return Membership::ADD_REJECTED; @@ -193,7 +193,7 @@ Membership::AddCredentialResult Membership::addCredential(const RuntimeEnvironme Membership::AddCredentialResult Membership::addCredential(const RuntimeEnvironment *RR,void *tPtr,const NetworkConfig &nconf,const Revocation &rev) { - uint64_t *rt; + int64_t *rt; switch(rev.verify(RR,tPtr)) { default: RR->t->credentialRejected(tPtr,rev,"invalid"); |