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

Fix race in multiple DB mirroring configurations.

Browse Source
This commit is contained in:
Adam Ierymenko
2019-08-08 15:29:13 -05:00
parent ad2a7c2590
commit 28d0070ce2
5 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controller/LFDB.cpp
View File

@ -369,7 +369,7 @@ bool LFDB::save(nlohmann::json &record,bool notifyListeners)
if (nwid) {
nlohmann::json old;
get(nwid,old);
if ((!old.is_object())||(old != record)) {
if ((!old.is_object())||(!_compareRecords(old,record))) {
record["revision"] = OSUtils::jsonInt(record["revision"],0ULL) + 1ULL;
_networkChanged(old,record,notifyListeners);
{
@ -385,7 +385,7 @@ bool LFDB::save(nlohmann::json &record,bool notifyListeners)
if ((id)&&(nwid)) {
nlohmann::json network,old;
get(nwid,network,id,old);
if ((!old.is_object())||(old != record)) {
if ((!old.is_object())||(!_compareRecords(old,record))) {
record["revision"] = OSUtils::jsonInt(record["revision"],0ULL) + 1ULL;
_memberChanged(old,record,notifyListeners);
{