mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-06-06 12:33:44 +02:00
More tweaks to TCP logic for GitHub issue #60
This commit is contained in:
parent
28a6d328a5
commit
a8c12369fd
1 changed files with 6 additions and 4 deletions
|
@ -170,12 +170,12 @@ bool Peer::sendPing(const RuntimeEnvironment *_r,uint64_t now)
|
||||||
bool sent = false;
|
bool sent = false;
|
||||||
SharedPtr<Peer> self(this);
|
SharedPtr<Peer> self(this);
|
||||||
Mutex::Lock _l(_lock);
|
Mutex::Lock _l(_lock);
|
||||||
bool useTcp = _isTcpFailoverTime(_r,now);
|
bool useTcpOut = _isTcpFailoverTime(_r,now);
|
||||||
|
|
||||||
TRACE("PING %s (useTcp==%d)",_id.address().toString().c_str(),(int)useTcp);
|
TRACE("PING %s (useTcpOut==%d)",_id.address().toString().c_str(),(int)useTcpOut);
|
||||||
|
|
||||||
for(std::vector<Path>::iterator p(_paths.begin());p!=_paths.end();++p) {
|
for(std::vector<Path>::iterator p(_paths.begin());p!=_paths.end();++p) {
|
||||||
if ((useTcp)||(!p->tcp())) {
|
if ((useTcpOut)||(p->type() != Path::PATH_TYPE_TCP_OUT)) {
|
||||||
p->pinged(now); // we log pings sent even if the send "fails", since what we want to track is when we last tried to ping
|
p->pinged(now); // we log pings sent even if the send "fails", since what we want to track is when we last tried to ping
|
||||||
if (_r->sw->sendHELLO(self,*p)) {
|
if (_r->sw->sendHELLO(self,*p)) {
|
||||||
p->sent(now);
|
p->sent(now);
|
||||||
|
@ -210,15 +210,17 @@ bool Peer::_isTcpFailoverTime(const RuntimeEnvironment *_r,uint64_t now) const
|
||||||
|
|
||||||
uint64_t lastUdpPingSent = 0;
|
uint64_t lastUdpPingSent = 0;
|
||||||
uint64_t lastUdpReceive = 0;
|
uint64_t lastUdpReceive = 0;
|
||||||
|
bool haveUdp = false;
|
||||||
|
|
||||||
for(std::vector<Path>::const_iterator p(_paths.begin());p!=_paths.end();++p) {
|
for(std::vector<Path>::const_iterator p(_paths.begin());p!=_paths.end();++p) {
|
||||||
if (p->type() == Path::PATH_TYPE_UDP) {
|
if (p->type() == Path::PATH_TYPE_UDP) {
|
||||||
lastUdpPingSent = std::max(lastUdpPingSent,p->lastPing());
|
lastUdpPingSent = std::max(lastUdpPingSent,p->lastPing());
|
||||||
lastUdpReceive = std::max(lastUdpReceive,p->lastReceived());
|
lastUdpReceive = std::max(lastUdpReceive,p->lastReceived());
|
||||||
|
haveUdp = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return ( (lastUdpPingSent > lastResync) && ((now - lastUdpReceive) >= ZT_TCP_TUNNEL_FAILOVER_TIMEOUT) );
|
return ( (!haveUdp) || ( (lastUdpPingSent > lastResync) && ((now - lastUdpReceive) >= ZT_TCP_TUNNEL_FAILOVER_TIMEOUT) ) );
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue