summaryrefslogtreecommitdiff
path: root/node/Peer.cpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2015-10-20 15:27:53 -0700
committerAdam Ierymenko <adam.ierymenko@gmail.com>2015-10-20 15:27:53 -0700
commit57e29857cf79019af03f6a3dfe0bf6fd36e2fab2 (patch)
treeb02b9f21d7a05e6621445cc4cf80f20e257fefb3 /node/Peer.cpp
parent5e6eae620bec49086e2ad80c119f3386d84092b1 (diff)
downloadinfinitytier-57e29857cf79019af03f6a3dfe0bf6fd36e2fab2.tar.gz
infinitytier-57e29857cf79019af03f6a3dfe0bf6fd36e2fab2.zip
Cluster work -- integrating with the rest of the code.
Diffstat (limited to 'node/Peer.cpp')
-rw-r--r--node/Peer.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/node/Peer.cpp b/node/Peer.cpp
index 6f566be4..0ba379c6 100644
--- a/node/Peer.cpp
+++ b/node/Peer.cpp
@@ -213,6 +213,12 @@ bool Peer::doPingAndKeepalive(const RuntimeEnvironment *RR,uint64_t now,int inet
void Peer::pushDirectPaths(const RuntimeEnvironment *RR,RemotePath *path,uint64_t now,bool force)
{
+#ifdef ZT_ENABLE_CLUSTER
+ // Cluster mode disables normal PUSH_DIRECT_PATHS in favor of cluster-based peer redirection
+ if (RR->cluster)
+ return;
+#endif
+
Mutex::Lock _l(_lock);
if (((now - _lastDirectPathPushSent) >= ZT_DIRECT_PATH_PUSH_INTERVAL)||(force)) {