From 5bb854e504a0db968b47c0a983d0148629e126e7 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Tue, 28 Oct 2014 17:25:34 -0700 Subject: Fix a nasty bug introduced in packet fragmentation a while back during refactoring, and a few other things related to multicast. --- node/Multicaster.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'node/Multicaster.cpp') diff --git a/node/Multicaster.cpp b/node/Multicaster.cpp index 94c6a45b..4d1b82d4 100644 --- a/node/Multicaster.cpp +++ b/node/Multicaster.cpp @@ -325,7 +325,7 @@ void Multicaster::clean(uint64_t now) // so that remaining members can be sorted in ascending order of // transmit priority. std::vector::iterator reader(mm->second.members.begin()); - std::vector::iterator writer(mm->second.members.begin()); + std::vector::iterator writer(reader); unsigned int count = 0; while (reader != mm->second.members.end()) { if ((now - reader->timestamp) < ZT_MULTICAST_LIKE_EXPIRE) { @@ -363,7 +363,10 @@ void Multicaster::clean(uint64_t now) } else if (mm->second.txQueue.empty()) { // There are no remaining members and no pending multicasts, so erase the entry _groups.erase(mm++); - } else ++mm; + } else { + mm->second.members.clear(); + ++mm; + } } } @@ -399,10 +402,14 @@ void Multicaster::_add(uint64_t now,uint64_t nwid,const MulticastGroup &mg,Multi 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();) { - tx->sendIfNew(RR,member); if (tx->atLimit()) gs.txQueue.erase(tx++); - else ++tx; + else { + tx->sendIfNew(RR,member); + if (tx->atLimit()) + gs.txQueue.erase(tx++); + else ++tx; + } } } } -- cgit v1.2.3