dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some cleanup, and use best (not first) UDP addresses for NAT-t VERB_RENDEZVOUS computation.

Browse source
This commit is contained in:
Adam Ierymenko 2014-04-09 16:00:25 -07:00
parent d9836adbf6
commit 73153b89b4
2 changed files with 65 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

38
node/Peer.cpp
View file

@ -225,4 +225,42 @@ bool Peer::_isTcpFailoverTime(const RuntimeEnvironment *_r,uint64_t now) const
return false;
}
bool Peer::pingUnanswered(const RuntimeEnvironment *_r,uint64_t now)
{
uint64_t lp = 0;
uint64_t lr = 0;
{
Mutex::Lock _l(_lock);
for(std::vector<Path>::const_iterator p(_paths.begin());p!=_paths.end();++p) {
lp = std::max(p->lastPing(),lp);
lr = std::max(p->lastReceived(),lr);
}
}
return ( (lp > _r->timeOfLastResynchronize) && ((lr < lp)&&((lp - lr) >= ZT_PING_UNANSWERED_AFTER)) );
}
void Peer::getBestActiveUdpPathAddresses(uint64_t now,InetAddress &v4,InetAddress &v6) const
{
uint64_t bestV4 = 0,bestV6 = 0;
Mutex::Lock _l(_lock);
for(std::vector<Path>::const_iterator p(_paths.begin());p!=_paths.end();++p) {
if ((p->type() == Path::PATH_TYPE_UDP)&&(p->active(now))) {
uint64_t lr = p->lastReceived();
if (lr) {
if (p->address().isV4()) {
if (lr >= bestV4) {
bestV4 = lr;
v4 = p->address();
}
} else if (p->address().isV6()) {
if (lr >= bestV6) {
bestV6 = lr;
v6 = p->address();
}
}
}
}
}
}
} // namespace ZeroTier