diff options
| author | Grant Limberg <grant.limberg@zerotier.com> | 2017-02-23 12:26:11 -0800 |
|---|---|---|
| committer | Grant Limberg <grant.limberg@zerotier.com> | 2017-02-23 12:26:11 -0800 |
| commit | 93ec86a26e5e9312ee913258c3e55eb03af147a7 (patch) | |
| tree | 48ceb7272465381af55e57dd373efbc89ef65146 | |
| parent | 10185e92faa77a4b032a27a7c01b4186727b91b9 (diff) | |
| download | infinitytier-93ec86a26e5e9312ee913258c3e55eb03af147a7.tar.gz infinitytier-93ec86a26e5e9312ee913258c3e55eb03af147a7.zip | |
iOS fixes
| -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 c1dbd8f8..90867162 100644 --- a/include/ZeroTierOne.h +++ b/include/ZeroTierOne.h @@ -1798,7 +1798,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 1eacb93d..c021cc76 100644 --- a/node/Membership.cpp +++ b/node/Membership.cpp @@ -253,21 +253,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,coo,*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; |