mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-06-06 20:43:44 +02:00
Fix thinko in multicast changes... works now!
This commit is contained in:
Adam Ierymenko
parent
7619b0ecbd
commit
959f611a65
1 changed files with 111 additions and 111 deletions
|
|
@ -178,127 +178,127 @@ void Multicaster::send(
|
||||||
indexes[j] = indexes[i];
|
indexes[j] = indexes[i];
|
||||||
indexes[i] = tmp;
|
indexes[i] = tmp;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (gs.members.size() >= limit) {
|
if (gs.members.size() >= limit) {
|
||||||
// If we already have enough members, just send and we're done. We can
|
// If we already have enough members, just send and we're done. We can
|
||||||
// skip the TX queue and skip the overhead of maintaining a send log by
|
// skip the TX queue and skip the overhead of maintaining a send log by
|
||||||
// using sendOnly().
|
// using sendOnly().
|
||||||
OutboundMulticast out;
|
OutboundMulticast out;
|
||||||
|
|
||||||
out.init(
|
out.init(
|
||||||
RR,
|
RR,
|
||||||
now,
|
now,
|
||||||
nwid,
|
nwid,
|
||||||
com,
|
com,
|
||||||
limit,
|
limit,
|
||||||
2, // we'll still gather a little from peers to keep multicast list fresh
|
2, // we'll still gather a little from peers to keep multicast list fresh
|
||||||
src,
|
src,
|
||||||
mg,
|
mg,
|
||||||
etherType,
|
etherType,
|
||||||
data,
|
data,
|
||||||
len);
|
len);
|
||||||
|
|
||||||
unsigned int count = 0;
|
unsigned int count = 0;
|
||||||
|
|
||||||
for(std::vector<Address>::const_iterator ast(alwaysSendTo.begin());ast!=alwaysSendTo.end();++ast) {
|
for(std::vector<Address>::const_iterator ast(alwaysSendTo.begin());ast!=alwaysSendTo.end();++ast) {
|
||||||
{ // TODO / LEGACY: don't send new multicast frame to old peers (if we know their version)
|
{ // TODO / LEGACY: don't send new multicast frame to old peers (if we know their version)
|
||||||
SharedPtr<Peer> p(RR->topology->getPeer(*ast));
|
SharedPtr<Peer> p(RR->topology->getPeer(*ast));
|
||||||
if ((p)&&(p->remoteVersionKnown())&&(p->remoteVersionMajor() < 1))
|
if ((p)&&(p->remoteVersionKnown())&&(p->remoteVersionMajor() < 1))
|
||||||
continue;
|
continue;
|
||||||
}
|
|
||||||
|
|
||||||
out.sendOnly(RR,*ast);
|
|
||||||
if (++count >= limit)
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned long idx = 0;
|
out.sendOnly(RR,*ast);
|
||||||
while (count < limit) {
|
if (++count >= limit)
|
||||||
const MulticastGroupMember &m = gs.members[indexes[idx++]];
|
break;
|
||||||
|
|
||||||
{ // TODO / LEGACY: don't send new multicast frame to old peers (if we know their version)
|
|
||||||
SharedPtr<Peer> p(RR->topology->getPeer(m.address));
|
|
||||||
if ((p)&&(p->remoteVersionKnown())&&(p->remoteVersionMajor() < 1))
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (std::find(alwaysSendTo.begin(),alwaysSendTo.end(),m.address) == alwaysSendTo.end()) {
|
|
||||||
out.sendOnly(RR,m.address);
|
|
||||||
++count;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
unsigned int gatherLimit = (limit - (unsigned int)gs.members.size()) + 1;
|
|
||||||
|
|
||||||
if ((now - gs.lastExplicitGather) >= ZT_MULTICAST_EXPLICIT_GATHER_DELAY) {
|
|
||||||
gs.lastExplicitGather = now;
|
|
||||||
SharedPtr<Peer> sn(RR->topology->getBestSupernode());
|
|
||||||
if (sn) {
|
|
||||||
TRACE(">>MC GATHER up to %u in %.16llx/%s",gatherLimit,nwid,mg.toString().c_str());
|
|
||||||
|
|
||||||
Packet outp(sn->address(),RR->identity.address(),Packet::VERB_MULTICAST_GATHER);
|
|
||||||
outp.append(nwid);
|
|
||||||
outp.append((uint8_t)0);
|
|
||||||
mg.mac().appendTo(outp);
|
|
||||||
outp.append((uint32_t)mg.adi());
|
|
||||||
outp.append((uint32_t)gatherLimit); // +1 just means we'll have an extra in the queue if available
|
|
||||||
outp.armor(sn->key(),true);
|
|
||||||
sn->send(RR,outp.data(),outp.size(),now);
|
|
||||||
}
|
|
||||||
gatherLimit = 0; // don't need to gather from peers this time since we consulted the core
|
|
||||||
}
|
|
||||||
|
|
||||||
gs.txQueue.push_back(OutboundMulticast());
|
|
||||||
OutboundMulticast &out = gs.txQueue.back();
|
|
||||||
|
|
||||||
out.init(
|
|
||||||
RR,
|
|
||||||
now,
|
|
||||||
nwid,
|
|
||||||
com,
|
|
||||||
limit,
|
|
||||||
gatherLimit,
|
|
||||||
src,
|
|
||||||
mg,
|
|
||||||
etherType,
|
|
||||||
data,
|
|
||||||
len);
|
|
||||||
|
|
||||||
unsigned int count = 0;
|
|
||||||
|
|
||||||
for(std::vector<Address>::const_iterator ast(alwaysSendTo.begin());ast!=alwaysSendTo.end();++ast) {
|
|
||||||
{ // TODO / LEGACY: don't send new multicast frame to old peers (if we know their version)
|
|
||||||
SharedPtr<Peer> p(RR->topology->getPeer(*ast));
|
|
||||||
if ((p)&&(p->remoteVersionKnown())&&(p->remoteVersionMajor() < 1))
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
out.sendAndLog(RR,*ast);
|
|
||||||
if (++count >= limit)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned long idx = 0;
|
|
||||||
while ((count < limit)&&(idx < gs.members.size())) {
|
|
||||||
const MulticastGroupMember &m = gs.members[indexes[idx++]];
|
|
||||||
|
|
||||||
{ // TODO / LEGACY: don't send new multicast frame to old peers (if we know their version)
|
|
||||||
SharedPtr<Peer> p(RR->topology->getPeer(m.address));
|
|
||||||
if ((p)&&(p->remoteVersionKnown())&&(p->remoteVersionMajor() < 1))
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (std::find(alwaysSendTo.begin(),alwaysSendTo.end(),m.address) == alwaysSendTo.end()) {
|
|
||||||
out.sendAndLog(RR,m.address);
|
|
||||||
++count;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (indexes != idxbuf)
|
unsigned long idx = 0;
|
||||||
delete [] indexes;
|
while (count < limit) {
|
||||||
|
const MulticastGroupMember &m = gs.members[indexes[idx++]];
|
||||||
|
|
||||||
|
{ // TODO / LEGACY: don't send new multicast frame to old peers (if we know their version)
|
||||||
|
SharedPtr<Peer> p(RR->topology->getPeer(m.address));
|
||||||
|
if ((p)&&(p->remoteVersionKnown())&&(p->remoteVersionMajor() < 1))
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (std::find(alwaysSendTo.begin(),alwaysSendTo.end(),m.address) == alwaysSendTo.end()) {
|
||||||
|
out.sendOnly(RR,m.address);
|
||||||
|
++count;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
unsigned int gatherLimit = (limit - (unsigned int)gs.members.size()) + 1;
|
||||||
|
|
||||||
|
if ((now - gs.lastExplicitGather) >= ZT_MULTICAST_EXPLICIT_GATHER_DELAY) {
|
||||||
|
gs.lastExplicitGather = now;
|
||||||
|
SharedPtr<Peer> sn(RR->topology->getBestSupernode());
|
||||||
|
if (sn) {
|
||||||
|
TRACE(">>MC GATHER up to %u in %.16llx/%s",gatherLimit,nwid,mg.toString().c_str());
|
||||||
|
|
||||||
|
Packet outp(sn->address(),RR->identity.address(),Packet::VERB_MULTICAST_GATHER);
|
||||||
|
outp.append(nwid);
|
||||||
|
outp.append((uint8_t)0);
|
||||||
|
mg.mac().appendTo(outp);
|
||||||
|
outp.append((uint32_t)mg.adi());
|
||||||
|
outp.append((uint32_t)gatherLimit); // +1 just means we'll have an extra in the queue if available
|
||||||
|
outp.armor(sn->key(),true);
|
||||||
|
sn->send(RR,outp.data(),outp.size(),now);
|
||||||
|
}
|
||||||
|
gatherLimit = 0; // don't need to gather from peers this time since we consulted the core
|
||||||
|
}
|
||||||
|
|
||||||
|
gs.txQueue.push_back(OutboundMulticast());
|
||||||
|
OutboundMulticast &out = gs.txQueue.back();
|
||||||
|
|
||||||
|
out.init(
|
||||||
|
RR,
|
||||||
|
now,
|
||||||
|
nwid,
|
||||||
|
com,
|
||||||
|
limit,
|
||||||
|
gatherLimit,
|
||||||
|
src,
|
||||||
|
mg,
|
||||||
|
etherType,
|
||||||
|
data,
|
||||||
|
len);
|
||||||
|
|
||||||
|
unsigned int count = 0;
|
||||||
|
|
||||||
|
for(std::vector<Address>::const_iterator ast(alwaysSendTo.begin());ast!=alwaysSendTo.end();++ast) {
|
||||||
|
{ // TODO / LEGACY: don't send new multicast frame to old peers (if we know their version)
|
||||||
|
SharedPtr<Peer> p(RR->topology->getPeer(*ast));
|
||||||
|
if ((p)&&(p->remoteVersionKnown())&&(p->remoteVersionMajor() < 1))
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
out.sendAndLog(RR,*ast);
|
||||||
|
if (++count >= limit)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned long idx = 0;
|
||||||
|
while ((count < limit)&&(idx < gs.members.size())) {
|
||||||
|
const MulticastGroupMember &m = gs.members[indexes[idx++]];
|
||||||
|
|
||||||
|
{ // TODO / LEGACY: don't send new multicast frame to old peers (if we know their version)
|
||||||
|
SharedPtr<Peer> p(RR->topology->getPeer(m.address));
|
||||||
|
if ((p)&&(p->remoteVersionKnown())&&(p->remoteVersionMajor() < 1))
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (std::find(alwaysSendTo.begin(),alwaysSendTo.end(),m.address) == alwaysSendTo.end()) {
|
||||||
|
out.sendAndLog(RR,m.address);
|
||||||
|
++count;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (indexes != idxbuf)
|
||||||
|
delete [] indexes;
|
||||||
|
|
||||||
// DEPRECATED / LEGACY / TODO:
|
// DEPRECATED / LEGACY / TODO:
|
||||||
// Currently we also always send a legacy P5_MULTICAST_FRAME packet to our
|
// Currently we also always send a legacy P5_MULTICAST_FRAME packet to our
|
||||||
// supernode. Our supernode then takes care of relaying it down to <1.0.0
|
// supernode. Our supernode then takes care of relaying it down to <1.0.0
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue