From 04e4c5263e17f45d107ed697c2ebea7b98238744 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Wed, 26 Nov 2014 13:39:57 -0800 Subject: [PATCH] Remove more legacy code -- just doing the supernode redist for old multicast is now good enough given the small number of legacy nodes left. --- node/Multicaster.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/node/Multicaster.cpp b/node/Multicaster.cpp index b9b4d5e0e..bb03e9764 100644 --- a/node/Multicaster.cpp +++ b/node/Multicaster.cpp @@ -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)")); - // Try to send to any outgoing multicasts that are waiting for more recipients - // TODO / LEGACY: don't send new multicast frame to old peers (if we know their version) - SharedPtr p(RR->topology->getPeer(member)); - if ((!p)||(!p->remoteVersionKnown())||(p->remoteVersionMajor() >= 1)) { - for(std::list::iterator tx(gs.txQueue.begin());tx!=gs.txQueue.end();) { - if (tx->atLimit()) { + for(std::list::iterator tx(gs.txQueue.begin());tx!=gs.txQueue.end();) { + if (tx->atLimit()) { + gs.txQueue.erase(tx++); + } else { + tx->sendIfNew(RR,member); + if (tx->atLimit()) gs.txQueue.erase(tx++); - } else { - tx->sendIfNew(RR,member); - if (tx->atLimit()) - gs.txQueue.erase(tx++); - else ++tx; - } + else ++tx; } } }