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

Merge branch 'adamierymenko-dev' into android-jni

Browse Source
This commit is contained in:
Adam Ierymenko 2015-05-04 16:47:18 -07:00
commit af66f14761
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
node/NetworkConfig.cpp
View File

@ -210,7 +210,14 @@ bool NetworkConfig::operator==(const NetworkConfig &nc) const
if (_description != nc._description) return false; if (_description != nc._description) return false;
if (_staticIps != nc._staticIps) return false; if (_staticIps != nc._staticIps) return false;
if (_activeBridges != nc._activeBridges) return false; if (_activeBridges != nc._activeBridges) return false;
if (_multicastRates != nc._multicastRates) return false; if (_multicastRates.size() == nc._multicastRates.size()) {
// uclibc++ doesn't seem to implement map<> != map<> correctly, so do
// it ourselves. Note that this depends on the maps being sorted.
for(std::map<MulticastGroup,MulticastRate>::const_iterator a(_multicastRates.begin()),b(nc._multicastRates.begin());a!=_multicastRates.end();++a,++b) {
if ((a->first != b->first)||(a->second != b->second))
return false;
}
} else return false;
if (_com != nc._com) return false; if (_com != nc._com) return false;
return true; return true;
} }