diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-01-30 15:26:12 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-01-30 15:26:12 -0800 |
| commit | 525ab3faa9e41a1bf45492016ba1b4af804a3a0f (patch) | |
| tree | 592b43b2f8e419e79565a07cdb60a2b0bdfb16ea /node | |
| parent | 490e86dde3532b36617548bdf9d952caa43dffa3 (diff) | |
| download | infinitytier-525ab3faa9e41a1bf45492016ba1b4af804a3a0f.tar.gz infinitytier-525ab3faa9e41a1bf45492016ba1b4af804a3a0f.zip | |
Take TRACE back out of Mac makefile, fix a few decode little things.
Diffstat (limited to 'node')
| -rw-r--r-- | node/Switch.cpp | 2 | ||||
| -rw-r--r-- | node/Topology.hpp | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/node/Switch.cpp b/node/Switch.cpp index 6c7d0fc9..bf4f812d 100644 --- a/node/Switch.cpp +++ b/node/Switch.cpp @@ -67,7 +67,7 @@ Switch::~Switch() void Switch::onRemotePacket(Demarc::Port localPort,const InetAddress &fromAddr,const Buffer<4096> &data) { try { - if (data.size() >= ZT_PROTO_MIN_FRAGMENT_LENGTH) { + if (data.size() > ZT_PROTO_MIN_FRAGMENT_LENGTH) { if (data[ZT_PACKET_FRAGMENT_IDX_FRAGMENT_INDICATOR] == ZT_PACKET_FRAGMENT_INDICATOR) _handleRemotePacketFragment(localPort,fromAddr,data); else if (data.size() >= ZT_PROTO_MIN_PACKET_LENGTH) diff --git a/node/Topology.hpp b/node/Topology.hpp index 4a6d711f..c6347d0a 100644 --- a/node/Topology.hpp +++ b/node/Topology.hpp @@ -259,14 +259,14 @@ public: inline void operator()(Topology &t,const SharedPtr<Peer> &p) { - if (_supernodeAddresses.count(p->address())) - return; // skip supernodes - p->forgetDirectPaths(false); // false means don't forget 'fixed' paths e.g. supernodes - if (((_now - p->lastFrame()) < ZT_PEER_LINK_ACTIVITY_TIMEOUT)&&(_supernode)) { - TRACE("sending reset NOP to %s",p->address().toString().c_str()); - Packet outp(p->address(),_r->identity.address(),Packet::VERB_NOP); - outp.armor(p->key(),false); // no need to encrypt a NOP - _supernode->send(_r,outp.data(),outp.size(),_now); + if (!_supernodeAddresses.count(p->address())) { + p->forgetDirectPaths(false); // false means don't forget 'fixed' paths e.g. supernodes + if (((_now - p->lastFrame()) < ZT_PEER_LINK_ACTIVITY_TIMEOUT)&&(_supernode)) { + TRACE("sending reset NOP to %s",p->address().toString().c_str()); + Packet outp(p->address(),_r->identity.address(),Packet::VERB_NOP); + outp.armor(p->key(),false); // no need to encrypt a NOP + _supernode->send(_r,outp.data(),outp.size(),_now); + } } } |