From cf4700bc26359203ceb9e9604465e805d9e5b442 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Sat, 14 Jun 2014 20:24:19 +0000 Subject: 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. --- node/Network.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'node/Network.cpp') diff --git a/node/Network.cpp b/node/Network.cpp index 99423637..d465c9df 100644 --- a/node/Network.cpp +++ b/node/Network.cpp @@ -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::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; } -- cgit v1.2.3