void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
Adam Ierymenko 2019-06-25 10:06:50 -07:00
parent 554e0b7c6d
commit a3ef9b8a15
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
node/CertificateOfMembership.hpp
View file

@ -113,9 +113,7 @@ public:
* Create an empty certificate of membership * Create an empty certificate of membership
*/ */
CertificateOfMembership() : CertificateOfMembership() :
_qualifierCount(0) _qualifierCount(0) {}
{
}
/** /**
* Create from required fields common to all networks * Create from required fields common to all networks

12
node/Constants.hpp
View file

@ -225,11 +225,6 @@
*/ */
#define ZT_RECEIVE_QUEUE_TIMEOUT 5000 #define ZT_RECEIVE_QUEUE_TIMEOUT 5000
/**
* Maximum latency to allow for OK(HELLO) before packet is discarded
*/
#define ZT_HELLO_MAX_ALLOWABLE_LATENCY 120000
/** /**
* Maximum number of ZT hops allowed (this is not IP hops/TTL) * Maximum number of ZT hops allowed (this is not IP hops/TTL)
* *
@ -265,7 +260,7 @@
#define ZT_PING_CHECK_INVERVAL 5000 #define ZT_PING_CHECK_INVERVAL 5000
/** /**
* How often the local.conf file is checked for changes * How often the local.conf file is checked for changes (service, should be moved there)
*/ */
#define ZT_LOCAL_CONF_FILE_CHECK_INTERVAL 10000 #define ZT_LOCAL_CONF_FILE_CHECK_INTERVAL 10000
@ -464,8 +459,11 @@
/** /**
* Delay between full-fledge pings of directly connected peers. * Delay between full-fledge pings of directly connected peers.
*
* With multipath bonding enabled ping peers more often to measure * With multipath bonding enabled ping peers more often to measure
* packet loss and latency. * packet loss and latency. This uses more bandwidth so is disabled
* by default to avoid increasing idle bandwidth use for regular
* links.
*/ */
#define ZT_MULTIPATH_PEER_PING_PERIOD 5000 #define ZT_MULTIPATH_PEER_PING_PERIOD 5000

3
node/IncomingPacket.cpp
View file

@ -473,9 +473,6 @@ bool IncomingPacket::_doOK(const RuntimeEnvironment *RR,void *tPtr,const SharedP
case Packet::VERB_HELLO: { case Packet::VERB_HELLO: {
const uint64_t latency = RR->node->now() - at<uint64_t>(ZT_PROTO_VERB_HELLO__OK__IDX_TIMESTAMP); const uint64_t latency = RR->node->now() - at<uint64_t>(ZT_PROTO_VERB_HELLO__OK__IDX_TIMESTAMP);
if (latency > ZT_HELLO_MAX_ALLOWABLE_LATENCY)
return true;
const unsigned int vProto = (*this)[ZT_PROTO_VERB_HELLO__OK__IDX_PROTOCOL_VERSION]; const unsigned int vProto = (*this)[ZT_PROTO_VERB_HELLO__OK__IDX_PROTOCOL_VERSION];
const unsigned int vMajor = (*this)[ZT_PROTO_VERB_HELLO__OK__IDX_MAJOR_VERSION]; const unsigned int vMajor = (*this)[ZT_PROTO_VERB_HELLO__OK__IDX_MAJOR_VERSION];
const unsigned int vMinor = (*this)[ZT_PROTO_VERB_HELLO__OK__IDX_MINOR_VERSION]; const unsigned int vMinor = (*this)[ZT_PROTO_VERB_HELLO__OK__IDX_MINOR_VERSION];