ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-03-11 06:54:06 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Adjusted multipath constants

Browse Source
This commit is contained in:
Joseph Henry 2019-08-13 14:34:11 -07:00
parent 36d368cb78
commit 2593c6efee
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
node/Constants.hpp
View File

@ -401,7 +401,7 @@
/** /**
* How often an aggregate link statistics report is emitted into this tracing system * How often an aggregate link statistics report is emitted into this tracing system
*/ */
#define ZT_PATH_AGGREGATE_STATS_REPORT_INTERVAL 60000 #define ZT_PATH_AGGREGATE_STATS_REPORT_INTERVAL 30000
/** /**
* How much an aggregate link's component paths can vary from their target allocation * How much an aggregate link's component paths can vary from their target allocation
@ -467,7 +467,7 @@
* by default to avoid increasing idle bandwidth use for regular * by default to avoid increasing idle bandwidth use for regular
* links. * links.
*/ */
#define ZT_MULTIPATH_PEER_PING_PERIOD 5000 #define ZT_MULTIPATH_PEER_PING_PERIOD (ZT_PEER_PING_PERIOD / 10)
/** /**
* Paths are considered expired if they have not sent us a real packet in this long * Paths are considered expired if they have not sent us a real packet in this long

6
node/Peer.cpp
View File

@ -782,9 +782,6 @@ unsigned int Peer::doPingAndKeepalive(void *tPtr,int64_t now)
unsigned int sent = 0; unsigned int sent = 0;
Mutex::Lock _l(_paths_m); Mutex::Lock _l(_paths_m);
const bool sendFullHello = ((now - _lastSentFullHello) >= ZT_PEER_PING_PERIOD);
_lastSentFullHello = now;
processBackgroundPeerTasks(now); processBackgroundPeerTasks(now);
// Emit traces regarding aggregate link status // Emit traces regarding aggregate link status
@ -815,6 +812,9 @@ unsigned int Peer::doPingAndKeepalive(void *tPtr,int64_t now)
else break; else break;
} }
const bool sendFullHello = ((now - _lastSentFullHello) >= ZT_PEER_PING_PERIOD);
_lastSentFullHello = now;
unsigned int j = 0; unsigned int j = 0;
for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) { for(unsigned int i=0;i<ZT_MAX_PEER_NETWORK_PATHS;++i) {
if (_paths[i].p) { if (_paths[i].p) {