ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-05-02 08:43:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

More work on connection reset stuff...

Browse Source
This commit is contained in:
Adam Ierymenko 2014-01-29 22:04:23 -08:00
parent d75f2f7051
commit 6e076e77d8
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
node/Node.cpp
View File

@ -641,6 +641,7 @@ Node::ReasonForTermination Node::run()
} }
} }
} catch ( ... ) { } catch ( ... ) {
LOG("FATAL: unexpected exception in core loop: unknown exception");
return impl->terminateBecause(Node::NODE_UNRECOVERABLE_ERROR,"unexpected exception during outer main I/O loop"); return impl->terminateBecause(Node::NODE_UNRECOVERABLE_ERROR,"unexpected exception during outer main I/O loop");
} }

4
node/Switch.cpp
View File

@ -67,10 +67,10 @@ Switch::~Switch()
void Switch::onRemotePacket(Demarc::Port localPort,const InetAddress &fromAddr,const Buffer<4096> &data) void Switch::onRemotePacket(Demarc::Port localPort,const InetAddress &fromAddr,const Buffer<4096> &data)
{ {
try { 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) if (data[ZT_PACKET_FRAGMENT_IDX_FRAGMENT_INDICATOR] == ZT_PACKET_FRAGMENT_INDICATOR)
_handleRemotePacketFragment(localPort,fromAddr,data); _handleRemotePacketFragment(localPort,fromAddr,data);
else if (data.size() > ZT_PROTO_MIN_PACKET_LENGTH) else if (data.size() >= ZT_PROTO_MIN_PACKET_LENGTH)
_handleRemotePacketHead(localPort,fromAddr,data); _handleRemotePacketHead(localPort,fromAddr,data);
} }
} catch (std::exception &ex) { } catch (std::exception &ex) {

7
node/Topology.hpp
View File

@ -43,6 +43,7 @@
#include "InetAddress.hpp" #include "InetAddress.hpp"
#include "Utils.hpp" #include "Utils.hpp"
#include "Packet.hpp" #include "Packet.hpp"
#include "Logger.hpp"
namespace ZeroTier { namespace ZeroTier {
@ -250,16 +251,18 @@ public:
public: public:
ResetActivePeers(const RuntimeEnvironment *renv,uint64_t now) throw() : ResetActivePeers(const RuntimeEnvironment *renv,uint64_t now) throw() :
_now(now), _now(now),
_supernode(_r->topology->getBestSupernode()), _supernode(renv->topology->getBestSupernode()),
_supernodeAddresses(_r->topology->supernodeAddresses()), _supernodeAddresses(renv->topology->supernodeAddresses()),
_r(renv) {} _r(renv) {}
inline void operator()(Topology &t,const SharedPtr<Peer> &p) inline void operator()(Topology &t,const SharedPtr<Peer> &p)
{ {
if (_supernodeAddresses.count(p->address())) if (_supernodeAddresses.count(p->address()))
return; // skip supernodes return; // skip supernodes
TRACE(">> %s",p->address().toString().c_str());
p->forgetDirectPaths(false); // false means don't forget 'fixed' paths e.g. supernodes p->forgetDirectPaths(false); // false means don't forget 'fixed' paths e.g. supernodes
if (((_now - p->lastFrame()) < ZT_PEER_LINK_ACTIVITY_TIMEOUT)&&(_supernode)) { if (((_now - p->lastFrame()) < ZT_PEER_LINK_ACTIVITY_TIMEOUT)&&(_supernode)) {
TRACE("sending NOP to %s",p->address().toString().c_str());
Packet outp(p->address(),_r->identity.address(),Packet::VERB_NOP); Packet outp(p->address(),_r->identity.address(),Packet::VERB_NOP);
outp.armor(p->key(),false); // no need to encrypt a NOP outp.armor(p->key(),false); // no need to encrypt a NOP
_supernode->send(_r,outp.data(),outp.size(),_now); _supernode->send(_r,outp.data(),outp.size(),_now);