ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-02 15:30:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove more legacy code -- just doing the supernode redist for old multicast is now good enough given the small number of legacy nodes left.

Browse Source
This commit is contained in:
Adam Ierymenko 2014-11-26 13:39:57 -08:00
parent 4303376ba6
commit 04e4c5263e
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
node/Multicaster.cpp
View File

@ -373,19 +373,14 @@ void Multicaster::_add(uint64_t now,uint64_t nwid,const MulticastGroup &mg,Multi
//TRACE("..MC %s joined multicast group %.16llx/%s via %s",member.toString().c_str(),nwid,mg.toString().c_str(),((learnedFrom) ? learnedFrom.toString().c_str() : "(direct)")); //TRACE("..MC %s joined multicast group %.16llx/%s via %s",member.toString().c_str(),nwid,mg.toString().c_str(),((learnedFrom) ? learnedFrom.toString().c_str() : "(direct)"));
// Try to send to any outgoing multicasts that are waiting for more recipients for(std::list<OutboundMulticast>::iterator tx(gs.txQueue.begin());tx!=gs.txQueue.end();) {
// TODO / LEGACY: don't send new multicast frame to old peers (if we know their version) if (tx->atLimit()) {
SharedPtr<Peer> p(RR->topology->getPeer(member)); gs.txQueue.erase(tx++);
if ((!p)||(!p->remoteVersionKnown())||(p->remoteVersionMajor() >= 1)) { } else {
for(std::list<OutboundMulticast>::iterator tx(gs.txQueue.begin());tx!=gs.txQueue.end();) { tx->sendIfNew(RR,member);
if (tx->atLimit()) { if (tx->atLimit())
gs.txQueue.erase(tx++); gs.txQueue.erase(tx++);
} else { else ++tx;
tx->sendIfNew(RR,member);
if (tx->atLimit())
gs.txQueue.erase(tx++);
else ++tx;
}
} }
} }
} }