ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-22 18:22:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added ZT_DIRECT_PATH_PUSH_INTERVAL_MULTIPATH to decrease link aggregation time

Browse Source
This commit is contained in:
Joseph Henry 2019-08-13 12:41:30 -07:00
parent 3c7e25ed58
commit d8ce1f7914
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
node/Constants.hpp
View File

@ -546,6 +546,15 @@
*/ */
#define ZT_DIRECT_PATH_PUSH_INTERVAL_HAVEPATH 120000 #define ZT_DIRECT_PATH_PUSH_INTERVAL_HAVEPATH 120000
/**
* Interval between direct path pushes in milliseconds if we are currently in multipath
* mode. In this mode the distinction between ZT_DIRECT_PATH_PUSH_INTERVAL and
* ZT_DIRECT_PATH_PUSH_INTERVAL_HAVEPATH does not exist since we want to inform other
* peers of this peer's new link/address as soon as possible so that both peers can
* begin forming an aggregated link.
*/
#define ZT_DIRECT_PATH_PUSH_INTERVAL_MULTIPATH ZT_DIRECT_PATH_PUSH_INTERVAL_HAVEPATH / 16
/** /**
* Time horizon for push direct paths cutoff * Time horizon for push direct paths cutoff
*/ */

3
node/Peer.cpp
View File

@ -210,7 +210,8 @@ void Peer::received(
// is done less frequently. // is done less frequently.
if (this->trustEstablished(now)) { if (this->trustEstablished(now)) {
const int64_t sinceLastPush = now - _lastDirectPathPushSent; const int64_t sinceLastPush = now - _lastDirectPathPushSent;
if (sinceLastPush >= ((hops == 0) ? ZT_DIRECT_PATH_PUSH_INTERVAL_HAVEPATH : ZT_DIRECT_PATH_PUSH_INTERVAL)) { if (sinceLastPush >= ((hops == 0) ? ZT_DIRECT_PATH_PUSH_INTERVAL_HAVEPATH : ZT_DIRECT_PATH_PUSH_INTERVAL)
|| (_canUseMultipath && (sinceLastPush >= (ZT_DIRECT_PATH_PUSH_INTERVAL_MULTIPATH)))) {
_lastDirectPathPushSent = now; _lastDirectPathPushSent = now;
std::vector<InetAddress> pathsToPush(RR->node->directPaths()); std::vector<InetAddress> pathsToPush(RR->node->directPaths());
if (pathsToPush.size() > 0) { if (pathsToPush.size() > 0) {