diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-07-15 16:30:34 -0500 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2019-07-15 16:30:34 -0500 |
| commit | 90872c906fa0f415804873bb7388fea417e4252c (patch) | |
| tree | 2f94adb22b7cd4efe22b40a42d7534ac2db27d3e /node | |
| parent | bdc2ec1f5e2074c067ce225352de3e0dd92b1356 (diff) | |
| download | infinitytier-90872c906fa0f415804873bb7388fea417e4252c.tar.gz infinitytier-90872c906fa0f415804873bb7388fea417e4252c.zip | |
Fix FileDB stuff and latency measurement.
Diffstat (limited to 'node')
| -rw-r--r-- | node/IncomingPacket.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/node/IncomingPacket.cpp b/node/IncomingPacket.cpp index 7a1193c0..b774f1df 100644 --- a/node/IncomingPacket.cpp +++ b/node/IncomingPacket.cpp @@ -502,8 +502,8 @@ bool IncomingPacket::_doOK(const RuntimeEnvironment *RR,void *tPtr,const SharedP } } - if (!hops() && (RR->node->getMultipathMode() != ZT_MULTIPATH_NONE)) { - _path->updateLatency((unsigned int)latency, RR->node->now()); + if (!hops()) { + _path->updateLatency((unsigned int)latency,RR->node->now()); } peer->setRemoteVersion(vProto,vMajor,vMinor,vRevision); @@ -614,7 +614,7 @@ bool IncomingPacket::_doRENDEZVOUS(const RuntimeEnvironment *RR,void *tPtr,const const unsigned int port = at<uint16_t>(ZT_PROTO_VERB_RENDEZVOUS_IDX_PORT); const unsigned int addrlen = (*this)[ZT_PROTO_VERB_RENDEZVOUS_IDX_ADDRLEN]; if ((port > 0)&&((addrlen == 4)||(addrlen == 16))) { - const InetAddress atAddr(field(ZT_PROTO_VERB_RENDEZVOUS_IDX_ADDRESS,addrlen),addrlen,port); + InetAddress atAddr(field(ZT_PROTO_VERB_RENDEZVOUS_IDX_ADDRESS,addrlen),addrlen,port); if (RR->node->shouldUsePathForZeroTierTraffic(tPtr,with,_path->localSocket(),atAddr)) { const uint64_t junk = RR->node->prng(); RR->node->putPacket(tPtr,_path->localSocket(),atAddr,&junk,4,2); // send low-TTL junk packet to 'open' local NAT(s) and stateful firewalls |