gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Probable fix for GitHub issue #63 - do not unite() if either path is TCP, since doing so can result in asymmetric failed NAT-t over UDP if one side has a firewall that permits outgoing UDP but not incoming.

Browse Source
This commit is contained in:
Adam Ierymenko
2014-04-10 11:17:54 -07:00
parent 119ef5ecbf
commit b117ff5435
6 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
node/Peer.cpp
View File

@@ -117,7 +117,7 @@ void Peer::receive(
_lastMulticastFrame = now;
}
bool Peer::send(const RuntimeEnvironment *_r,const void *data,unsigned int len,uint64_t now)
Path::Type Peer::send(const RuntimeEnvironment *_r,const void *data,unsigned int len,uint64_t now)
{
Mutex::Lock _l(_lock);
@@ -164,9 +164,9 @@ bool Peer::send(const RuntimeEnvironment *_r,const void *data,unsigned int len,u
if ((bestPath)&&(_r->sm->send(bestPath->address(),bestPath->tcp(),bestPath->type() == Path::PATH_TYPE_TCP_OUT,data,len))) {
bestPath->sent(now);
return true;
return bestPath->type();
}
return false;
return Path::PATH_TYPE_NULL;
}
bool Peer::sendFirewallOpener(const RuntimeEnvironment *_r,uint64_t now)