From e7c81ef34e9db426d6ba72e2feae4180233631e5 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 3 Oct 2014 22:03:19 -0700 Subject: Turns out that needed to be a list after all. Also clean up Multicaster::gather(). --- node/Switch.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'node/Switch.cpp') diff --git a/node/Switch.cpp b/node/Switch.cpp index 32190a87..de245442 100644 --- a/node/Switch.cpp +++ b/node/Switch.cpp @@ -440,7 +440,7 @@ void Switch::doAnythingWaitingForPeer(const SharedPtr &peer) { // finish processing any packets waiting on peer's public key / identity Mutex::Lock _l(_rxQueue_m); - for(std::vector< SharedPtr >::iterator rxi(_rxQueue.begin());rxi!=_rxQueue.end();) { + for(std::list< SharedPtr >::iterator rxi(_rxQueue.begin());rxi!=_rxQueue.end();) { if ((*rxi)->tryDecode(RR)) _rxQueue.erase(rxi++); else ++rxi; @@ -527,7 +527,7 @@ unsigned long Switch::doTimerTasks() { Mutex::Lock _l(_rxQueue_m); - for(std::vector< SharedPtr >::iterator i(_rxQueue.begin());i!=_rxQueue.end();) { + for(std::list< SharedPtr >::iterator i(_rxQueue.begin());i!=_rxQueue.end();) { if ((now - (*i)->receiveTime()) > ZT_RECEIVE_QUEUE_TIMEOUT) { TRACE("RX %s -> %s timed out",(*i)->source().toString().c_str(),(*i)->destination().toString().c_str()); _rxQueue.erase(i++); -- cgit v1.2.3