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

Crash fix

Browse Source
This commit is contained in:
Adam Ierymenko
2021-02-03 18:56:07 -05:00
parent 378bc73bf8
commit ac808d51d6
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
node/Peer.cpp
View File

@@ -156,7 +156,7 @@ void Peer::received(
Mutex::Lock ltl(_lastTriedPath_m);
bool triedTooRecently = false;
for(std::vector< std::pair< Path *, int64_t > >::iterator i(_lastTriedPath.begin());i!=_lastTriedPath.end();) {
for(std::list< 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()) {

3
node/Peer.hpp
View File

@@ -15,6 +15,7 @@
#define ZT_PEER_HPP
#include <vector>
#include <list>
#include "../include/ZeroTierOne.h"
@@ -573,7 +574,7 @@ private:
uint16_t _vMinor;
uint16_t _vRevision;
std::vector< std::pair< Path *, int64_t > > _lastTriedPath;
std::list< std::pair< Path *, int64_t > > _lastTriedPath;
Mutex _lastTriedPath_m;
_PeerPath _paths[ZT_MAX_PEER_NETWORK_PATHS];