diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-02-23 12:35:20 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-02-23 12:35:20 -0800 |
| commit | 010dbc8b2b48902c385f8ae9f1411ff34f898774 (patch) | |
| tree | df2804d5c1ff8b71467142571d6c47f1a5b1c8bd | |
| parent | 72653e54f951b2a47686d420186f59f533542940 (diff) | |
| parent | 93ec86a26e5e9312ee913258c3e55eb03af147a7 (diff) | |
| download | infinitytier-010dbc8b2b48902c385f8ae9f1411ff34f898774.tar.gz infinitytier-010dbc8b2b48902c385f8ae9f1411ff34f898774.zip | |
Merge.
| -rw-r--r-- | include/ZeroTierOne.h | 2 | ||||
| -rw-r--r-- | node/Membership.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h index ddd0b404..8a13c117 100644 --- a/include/ZeroTierOne.h +++ b/include/ZeroTierOne.h @@ -1808,7 +1808,7 @@ enum ZT_ResultCode ZT_Node_orbit(ZT_Node *node,uint64_t moonWorldId,uint64_t moo * @param moonWorldId World ID of moon to remove * @return Error if anything bad happened */ -ZT_ResultCode ZT_Node_deorbit(ZT_Node *node,uint64_t moonWorldId); +enum ZT_ResultCode ZT_Node_deorbit(ZT_Node *node,uint64_t moonWorldId); /** * Get this node's 40-bit ZeroTier address diff --git a/node/Membership.cpp b/node/Membership.cpp index 5facbe24..d9fa5945 100644 --- a/node/Membership.cpp +++ b/node/Membership.cpp @@ -247,21 +247,21 @@ Membership::AddCredentialResult Membership::addCredential(const RuntimeEnvironme _RemoteCredential<CertificateOfOwnership> *have = ((htmp != &(_remoteCoos[ZT_MAX_CERTIFICATES_OF_OWNERSHIP]))&&((*htmp)->id == (uint64_t)coo.id())) ? *htmp : (_RemoteCredential<CertificateOfOwnership> *)0; if (have) { if ( (!_isCredentialTimestampValid(nconf,*have)) || (have->credential.timestamp() > coo.timestamp()) ) { - TRACE("addCredential(CertificateOfOwnership) for %s on %.16llx REJECTED (revoked or too old)",cap.issuedTo().toString().c_str(),cap.networkId()); + TRACE("addCredential(CertificateOfOwnership) for %s on %.16llx REJECTED (revoked or too old)",coo.issuedTo().toString().c_str(),coo.networkId()); return ADD_REJECTED; } if (have->credential == coo) { - TRACE("addCredential(CertificateOfOwnership) for %s on %.16llx ACCEPTED (redundant)",cap.issuedTo().toString().c_str(),cap.networkId()); + TRACE("addCredential(CertificateOfOwnership) for %s on %.16llx ACCEPTED (redundant)",coo.issuedTo().toString().c_str(),coo.networkId()); return ADD_ACCEPTED_REDUNDANT; } } switch(coo.verify(RR)) { default: - TRACE("addCredential(CertificateOfOwnership) for %s on %.16llx REJECTED (invalid)",cap.issuedTo().toString().c_str(),cap.networkId()); + TRACE("addCredential(CertificateOfOwnership) for %s on %.16llx REJECTED (invalid)",coo.issuedTo().toString().c_str(),coo.networkId()); return ADD_REJECTED; case 0: - TRACE("addCredential(CertificateOfOwnership) for %s on %.16llx ACCEPTED (new)",cap.issuedTo().toString().c_str(),cap.networkId()); + TRACE("addCredential(CertificateOfOwnership) for %s on %.16llx ACCEPTED (new)",coo.issuedTo().toString().c_str(),coo.networkId()); if (!have) have = _newCoo(coo.id()); have->lastReceived = RR->node->now(); have->credential = coo; |