void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 20:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sync bug fix

Browse source
This commit is contained in:
Adam Ierymenko 2019-08-08 16:30:52 -05:00
parent 28d0070ce2
commit 760ae07d72
No known key found for this signature in database
GPG key ID: 1657198823E52A61
1 changed files with 16 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
controller/LFDB.cpp
View file

@ -220,20 +220,16 @@ LFDB::LFDB(const Identity &myId,const char *path,const char *lfOwnerPrivate,cons
const uint64_t id = Utils::hexStrToU64(idstr.c_str()); const uint64_t id = Utils::hexStrToU64(idstr.c_str());
if ((id >> 24) == controllerAddressInt) { // sanity check if ((id >> 24) == controllerAddressInt) { // sanity check
std::lock_guard<std::mutex> sl(_state_l); nlohmann::json oldNetwork;
_NetworkState &ns = _state[id]; if ((timeRangeStart > 0)&&(get(id,oldNetwork))) {
if (!ns.dirty) { const uint64_t revision = network["revision"];
nlohmann::json oldNetwork; const uint64_t prevRevision = oldNetwork["revision"];
if ((timeRangeStart > 0)&&(get(id,oldNetwork))) { if (prevRevision < revision) {
const uint64_t revision = network["revision"]; _networkChanged(oldNetwork,network,timeRangeStart > 0);
const uint64_t prevRevision = oldNetwork["revision"];
if (prevRevision < revision) {
_networkChanged(oldNetwork,network,timeRangeStart > 0);
}
} else {
nlohmann::json nullJson;
_networkChanged(nullJson,network,timeRangeStart > 0);
} }
} else {
nlohmann::json nullJson;
_networkChanged(nullJson,network,timeRangeStart > 0);
} }
} }
@ -294,17 +290,13 @@ LFDB::LFDB(const Identity &myId,const char *path,const char *lfOwnerPrivate,cons
const uint64_t id = Utils::hexStrToU64(idstr.c_str()); const uint64_t id = Utils::hexStrToU64(idstr.c_str());
if ((id)&&((nwid >> 24) == controllerAddressInt)) { // sanity check if ((id)&&((nwid >> 24) == controllerAddressInt)) { // sanity check
std::lock_guard<std::mutex> sl(_state_l); nlohmann::json network,oldMember;
auto ns = _state.find(nwid); if ((timeRangeStart > 0)&&(get(nwid,network,id,oldMember))) {
if ((ns == _state.end())||(!ns->second.members[id].dirty)) { const uint64_t revision = member["revision"];
nlohmann::json network,oldMember; const uint64_t prevRevision = oldMember["revision"];
if ((timeRangeStart > 0)&&(get(nwid,network,id,oldMember))) { if (prevRevision < revision)
const uint64_t revision = member["revision"]; _memberChanged(oldMember,member,timeRangeStart > 0);
const uint64_t prevRevision = oldMember["revision"]; } else if (network.is_object()) {
if (prevRevision < revision)
_memberChanged(oldMember,member,timeRangeStart > 0);
}
} else {
nlohmann::json nullJson; nlohmann::json nullJson;
_memberChanged(nullJson,member,timeRangeStart > 0); _memberChanged(nullJson,member,timeRangeStart > 0);
} }