diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-07-06 16:40:23 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-07-06 16:40:23 -0700 |
| commit | cac55105c3db6b0992b3ca6261b368bb14c7d144 (patch) | |
| tree | a39fda341bebf37e44c70eba572f5a3396f7d8a4 | |
| parent | a87cd2d0941d5cf6b88f630159946ae66d3e464e (diff) | |
| download | infinitytier-cac55105c3db6b0992b3ca6261b368bb14c7d144.tar.gz infinitytier-cac55105c3db6b0992b3ca6261b368bb14c7d144.zip | |
Fix a regression.
| -rw-r--r-- | node/OutboundMulticast.cpp | 2 | ||||
| -rw-r--r-- | node/Switch.cpp | 10 |
2 files changed, 0 insertions, 12 deletions
diff --git a/node/OutboundMulticast.cpp b/node/OutboundMulticast.cpp index bda7ab00..5809504a 100644 --- a/node/OutboundMulticast.cpp +++ b/node/OutboundMulticast.cpp @@ -106,8 +106,6 @@ void OutboundMulticast::sendOnly(const RuntimeEnvironment *RR,const Address &toA if (!network) return; - if (!network->isAllowed(toAddr)) - return; if (_haveCom) { if (network->peerNeedsOurMembershipCertificate(toAddr,RR->node->now())) { diff --git a/node/Switch.cpp b/node/Switch.cpp index 6a0b07cd..201f36d1 100644 --- a/node/Switch.cpp +++ b/node/Switch.cpp @@ -164,16 +164,6 @@ void Switch::onLocalEthernet(const SharedPtr<Network> &network,const MAC &from,c Address toZT(to.toAddress(network->id())); if (network->isAllowed(toZT)) { - /* - if (network->peerNeedsOurMembershipCertificate(toZT,RR->node->now())) { - // TODO: once there are no more <1.0.0 nodes around, we can - // bundle this with EXT_FRAME instead of sending two packets. - Packet outp(toZT,RR->identity.address(),Packet::VERB_NETWORK_MEMBERSHIP_CERTIFICATE); - nconf->com().serialize(outp); - send(outp,true,network->id()); - } - */ - const bool includeCom = network->peerNeedsOurMembershipCertificate(toZT,RR->node->now()); if ((fromBridged)||(includeCom)) { Packet outp(toZT,RR->identity.address(),Packet::VERB_EXT_FRAME); |