dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify network briding modes -- we only need passive toggle and active bridge list, not three mode types. Also change isOpen to isPublic for terminology consistency.

Browse source
This commit is contained in:
Adam Ierymenko 2014-06-14 20:24:19 +00:00
parent 367b5439e1
commit cf4700bc26
8 changed files with 17 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

8
node/Network.cpp
View file

@ -235,7 +235,7 @@ bool Network::isAllowed(const Address &peer) const
if (!_config)
return false;
if (_config->isOpen())
if (_config->isPublic())
return true;
std::map<Address,CertificateOfMembership>::const_iterator pc(_membershipCertificates.find(peer));
@ -255,7 +255,7 @@ void Network::clean()
Mutex::Lock _l(_lock);
uint64_t now = Utils::now();
if ((_config)&&(_config->isOpen())) {
if ((_config)&&(_config->isPublic())) {
// Open (public) networks do not track certs or cert pushes at all.
_membershipCertificates.clear();
_lastPushedMembershipCertificate.clear();
@ -446,7 +446,7 @@ void Network::_restoreState()
}
// Read most recent multicast cert dump
if ((_config)&&(!_config->isOpen())&&(Utils::fileExists(mcdbPath.c_str()))) {
if ((_config)&&(!_config->isPublic())&&(Utils::fileExists(mcdbPath.c_str()))) {
CertificateOfMembership com;
Mutex::Lock _l(_lock);
@ -497,7 +497,7 @@ void Network::_dumpMulticastCerts()
if (!_config)
return;
if ((!_id)||(_config->isOpen())) {
if ((!_id)||(_config->isPublic())) {
Utils::rm(mcdbPath);
return;
}