diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-03-28 12:15:24 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2016-03-28 12:15:24 -0700 |
| commit | 284e5d83b50dc99dbc916237f26915bcce745960 (patch) | |
| tree | 66dc6dd81fe5700eda0a25175c88ec37c41003b9 | |
| parent | 2b3e1d5c100914274706070bfcd3c688b7955655 (diff) | |
| download | infinitytier-284e5d83b50dc99dbc916237f26915bcce745960.tar.gz infinitytier-284e5d83b50dc99dbc916237f26915bcce745960.zip | |
Fix some broken TRACEs and a tiny reorder in a few ifs.
| -rw-r--r-- | node/Peer.cpp | 6 | ||||
| -rw-r--r-- | node/Switch.hpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/node/Peer.cpp b/node/Peer.cpp index b9d11292..87ca94e1 100644 --- a/node/Peer.cpp +++ b/node/Peer.cpp @@ -386,7 +386,7 @@ bool Peer::validateAndSetNetworkMembershipCertificate(uint64_t nwid,const Certif // Check signature, log and return if cert is invalid if (com.signedBy() != Network::controllerFor(nwid)) { - TRACE("rejected network membership certificate for %.16llx signed by %s: signer not a controller of this network",(unsigned long long)_id,com.signedBy().toString().c_str()); + TRACE("rejected network membership certificate for %.16llx signed by %s: signer not a controller of this network",(unsigned long long)nwid,com.signedBy().toString().c_str()); return false; // invalid signer } @@ -395,7 +395,7 @@ bool Peer::validateAndSetNetworkMembershipCertificate(uint64_t nwid,const Certif // We are the controller: RR->identity.address() == controller() == cert.signedBy() // So, verify that we signed th cert ourself if (!com.verify(RR->identity)) { - TRACE("rejected network membership certificate for %.16llx self signed by %s: signature check failed",(unsigned long long)_id,com.signedBy().toString().c_str()); + TRACE("rejected network membership certificate for %.16llx self signed by %s: signature check failed",(unsigned long long)nwid,com.signedBy().toString().c_str()); return false; // invalid signature } @@ -411,7 +411,7 @@ bool Peer::validateAndSetNetworkMembershipCertificate(uint64_t nwid,const Certif } if (!com.verify(signer->identity())) { - TRACE("rejected network membership certificate for %.16llx signed by %s: signature check failed",(unsigned long long)_id,com.signedBy().toString().c_str()); + TRACE("rejected network membership certificate for %.16llx signed by %s: signature check failed",(unsigned long long)nwid,com.signedBy().toString().c_str()); return false; // invalid signature } } diff --git a/node/Switch.hpp b/node/Switch.hpp index 3ba2736d..219bfb41 100644 --- a/node/Switch.hpp +++ b/node/Switch.hpp @@ -191,10 +191,10 @@ private: unsigned long i = ZT_RX_QUEUE_SIZE; while (i) { rq = &(_rxQueue[--i]); - if (rq->timestamp < oldest->timestamp) - oldest = rq; if ((rq->packetId == packetId)&&(rq->timestamp)) return rq; + if (rq->timestamp < oldest->timestamp) + oldest = rq; } return oldest; } |