void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 12:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a regression.

Browse source
This commit is contained in:
Adam Ierymenko 2015-07-06 16:40:23 -07:00
parent a87cd2d094
commit cac55105c3
2 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
node/OutboundMulticast.cpp
View file

@ -106,8 +106,6 @@ void OutboundMulticast::sendOnly(const RuntimeEnvironment *RR,const Address &toA
if (!network) if (!network)
return; return;
if (!network->isAllowed(toAddr))
return;
if (_haveCom) { if (_haveCom) {
if (network->peerNeedsOurMembershipCertificate(toAddr,RR->node->now())) { if (network->peerNeedsOurMembershipCertificate(toAddr,RR->node->now())) {

10
node/Switch.cpp
View file

@ -164,16 +164,6 @@ void Switch::onLocalEthernet(const SharedPtr<Network> &network,const MAC &from,c
Address toZT(to.toAddress(network->id())); Address toZT(to.toAddress(network->id()));
if (network->isAllowed(toZT)) { 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()); const bool includeCom = network->peerNeedsOurMembershipCertificate(toZT,RR->node->now());
if ((fromBridged)||(includeCom)) { if ((fromBridged)||(includeCom)) {
Packet outp(toZT,RR->identity.address(),Packet::VERB_EXT_FRAME); Packet outp(toZT,RR->identity.address(),Packet::VERB_EXT_FRAME);