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

Cluster build fix.

Browse source
This commit is contained in:
Adam Ierymenko 2017-04-17 10:12:13 -07:00
parent ba5d0cc2f9
commit 95e5345cc3
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
node/Peer.cpp
View file

@ -109,7 +109,7 @@ void Peer::received(
outp.armor(_key,true,path->nextOutgoingCounter()); outp.armor(_key,true,path->nextOutgoingCounter());
path->send(RR,tPtr,outp.data(),outp.size(),now); path->send(RR,tPtr,outp.data(),outp.size(),now);
} }
suboptimalPath = true; isClusterSuboptimalPath = true;
} }
} }
#endif #endif

7
node/Peer.hpp
View file

@ -316,11 +316,8 @@ public:
*/ */
inline bool hasLocalClusterOptimalPath(uint64_t now) const inline bool hasLocalClusterOptimalPath(uint64_t now) const
{ {
for(unsigned int p=0,np=_numPaths;p<np;++p) { Mutex::Lock _l(_paths_m);
if ( (_paths[p].path->alive(now)) && (!_paths[p].localClusterSuboptimal) ) return ( ((_v4Path.p)&&(_v4Path.p->alive(now))&&(!_v4Path.localClusterSuboptimal)) || ((_v6Path.p)&&(_v6Path.p->alive(now))&&(!_v6Path.localClusterSuboptimal)) );
return true;
}
return false;
} }
#endif #endif