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

Fix moon persistence.

Browse Source
This commit is contained in:
Adam Ierymenko
2017-01-27 15:35:21 -08:00
parent 9f7919f71f
commit 1d775af34a
4 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
node/Topology.hpp
View File

@@ -195,7 +195,7 @@ public:
}
}
}
for(std::vector<Address>::const_iterator m(_contacingMoons.begin());m!=_contacingMoons.end();++m)
for(std::vector<Address>::const_iterator m(_contactingMoons.begin());m!=_contactingMoons.end();++m)
eps[*m];
}
@@ -206,7 +206,7 @@ public:
{
Mutex::Lock _l(_lock);
std::vector<Address> u(_upstreamAddresses);
for(std::vector<Address>::const_iterator m(_contacingMoons.begin());m!=_contacingMoons.end();++m) {
for(std::vector<Address>::const_iterator m(_contactingMoons.begin());m!=_contactingMoons.end();++m) {
if (std::find(u.begin(),u.end(),*m) == u.end())
u.push_back(*m);
}
@@ -251,10 +251,9 @@ public:
* Validate new world and update if newer and signature is okay
*
* @param newWorld A new or updated planet or moon to learn
* @param updateOnly If true only update currently known worlds
* @return True if it was valid and newer than current (or totally new for moons)
*/
bool addWorld(const World &newWorld,bool updateOnly);
bool addWorld(const World &newWorld);
/**
* Add a moon
@@ -407,7 +406,7 @@ private:
Hashtable< Address,SharedPtr<Peer> > _peers;
Hashtable< Path::HashKey,SharedPtr<Path> > _paths;
std::vector<Address> _contacingMoons;
std::vector<Address> _contactingMoons;
std::vector<Address> _upstreamAddresses;
bool _amRoot;