ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-04-09 04:04:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Clean up some peer path learning logic, use a cheaper data structure.

Browse Source
This commit is contained in:
Adam Ierymenko 2021-02-03 14:30:03 -05:00
parent 8430db4dc7
commit 378bc73bf8
No known key found for this signature in database
GPG Key ID: C8877CF2D7A5D7F3
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
node/Peer.cpp
View File

@ -116,7 +116,9 @@ void Peer::received(
havePath = true;
break;
}
} else break;
} else {
break;
}
}
}
@ -132,7 +134,7 @@ void Peer::received(
replacePath = i;
break;
} else {
const long q = _paths[i].p->quality(now);
const long q = _paths[i].p->quality(now) / _paths[i].priority;
if (q > replacePathQuality) {
replacePathQuality = q;
replacePath = i;
@ -150,22 +152,23 @@ void Peer::received(
_paths[replacePath].p = path;
_paths[replacePath].priority = 1;
}
{
Mutex::Lock ltl(_lastTriedPath_m);
uint64_t *k = (uint64_t *)0;
int64_t *v = (int64_t *)0;
Hashtable< uint64_t,int64_t >::Iterator i(_lastTriedPath);
while (i.next(k, v)) {
if ((now - *v) >= 2000)
_lastTriedPath.erase(*k);
}
}
} else {
Mutex::Lock ltl(_lastTriedPath_m);
int64_t &lt = _lastTriedPath[(uint64_t)path.ptr()];
if ((now - lt) >= 2000) {
lt = now;
bool triedTooRecently = false;
for(std::vector< std::pair< Path *, int64_t > >::iterator i(_lastTriedPath.begin());i!=_lastTriedPath.end();) {
if ((now - i->second) > 1000) {
_lastTriedPath.erase(i++);
} else if (i->first == path.ptr()) {
++i;
triedTooRecently = true;
} else {
++i;
}
}
if (!triedTooRecently) {
_lastTriedPath.push_back(std::pair< Path *, int64_t >(path.ptr(), now));
attemptToContactAt(tPtr,path->localSocket(),path->address(),now,true);
path->sent(now);
RR->t->peerConfirmingUnknownPath(tPtr,networkId,*this,path,packetId,verb);

2
node/Peer.hpp
View File

@ -573,7 +573,7 @@ private:
uint16_t _vMinor;
uint16_t _vRevision;
Hashtable< uint64_t, int64_t > _lastTriedPath;
std::vector< std::pair< Path *, int64_t > > _lastTriedPath;
Mutex _lastTriedPath_m;
_PeerPath _paths[ZT_MAX_PEER_NETWORK_PATHS];