ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-30 01:38:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change path selection logic to exclude non-fixed and non-active paths -- possible fix for "NAT traversal coma" issue. Also fix a typo.

Browse Source
This commit is contained in:
Adam Ierymenko 2014-11-20 13:20:16 -08:00
parent 7b6f10e859
commit ee9e6a3c6b
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make-mac.mk
View File

@ -50,7 +50,7 @@ one: $(OBJS) main.o
ln -sf zerotier-one zerotier-cli ln -sf zerotier-one zerotier-cli
ln -sf zerotier-one zerotier-idtool ln -sf zerotier-one zerotier-idtool
selftest: $(OBJS) sefltest.o selftest: $(OBJS) selftest.o
$(CXX) $(CXXFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LIBS) $(CXX) $(CXXFLAGS) -o zerotier-selftest selftest.o $(OBJS) $(LIBS)
$(STRIP) zerotier-selftest $(STRIP) zerotier-selftest

21
node/Peer.cpp
View File

@ -176,6 +176,25 @@ Path::Type Peer::send(const RuntimeEnvironment *RR,const void *data,unsigned int
} }
} }
Path *bestPath = (Path *)0;
uint64_t normalPathAge = now - bestNormalPathLastReceived;
uint64_t tcpOutPathAge = now - bestTcpOutPathLastReceived;
if (normalPathAge < ZT_PEER_PATH_ACTIVITY_TIMEOUT) {
/* If we have a normal path that looks alive, only use TCP if it looks
* even more alive, if the UDP path is not a very recent acquisition,
* and if TCP tunneling is globally enabled. */
bestPath = ( (tcpOutPathAge < normalPathAge) && (normalPathAge > (ZT_PEER_DIRECT_PING_DELAY / 4)) && (RR->tcpTunnelingEnabled) ) ? bestTcpOutPath : bestNormalPath;
} else if ( (tcpOutPathAge < ZT_PEER_PATH_ACTIVITY_TIMEOUT) || ((RR->tcpTunnelingEnabled)&&(bestTcpOutPath)) ) {
/* Otherwise use a TCP path if we have an active one or if TCP
* fallback has been globally triggered and we know of one at all. */
bestPath = bestTcpOutPath;
} else if ( (bestNormalPath) && (bestNormalPath->fixed()) ) {
/* Finally, use a normal path if we have a "fixed" one as these are
* always considered basically alive. */
bestPath = bestNormalPath;
}
/* Old path choice logic -- would attempt to use inactive paths... deprecating and will probably kill.
Path *bestPath = (Path *)0; Path *bestPath = (Path *)0;
if (bestTcpOutPath) { // we have a TCP out path if (bestTcpOutPath) { // we have a TCP out path
if (bestNormalPath) { // we have both paths, decide which to use if (bestNormalPath) { // we have both paths, decide which to use
@ -192,6 +211,8 @@ Path::Type Peer::send(const RuntimeEnvironment *RR,const void *data,unsigned int
} else { // we only have a normal path (or none at all, that case is caught below) } else { // we only have a normal path (or none at all, that case is caught below)
bestPath = bestNormalPath; bestPath = bestNormalPath;
} }
*/
if (!bestPath) if (!bestPath)
return Path::PATH_TYPE_NULL; return Path::PATH_TYPE_NULL;