mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-04-07 19:24:13 +00:00
Fix a regression.
This commit is contained in:
parent
a87cd2d094
commit
cac55105c3
@ -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())) {
|
||||
|
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user