diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-10-03 22:03:19 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-10-03 22:03:19 -0700 |
| commit | e7c81ef34e9db426d6ba72e2feae4180233631e5 (patch) | |
| tree | 3df3e177c0285ab328153adde896f5d6ba9a39c3 /node/Switch.cpp | |
| parent | 3f7e7e8a88e4edb0a62def5efbe204d22bbff7a4 (diff) | |
| download | infinitytier-e7c81ef34e9db426d6ba72e2feae4180233631e5.tar.gz infinitytier-e7c81ef34e9db426d6ba72e2feae4180233631e5.zip | |
Turns out that needed to be a list after all. Also clean up Multicaster::gather().
Diffstat (limited to 'node/Switch.cpp')
| -rw-r--r-- | node/Switch.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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> &peer) { // finish processing any packets waiting on peer's public key / identity Mutex::Lock _l(_rxQueue_m); - for(std::vector< SharedPtr<IncomingPacket> >::iterator rxi(_rxQueue.begin());rxi!=_rxQueue.end();) { + for(std::list< SharedPtr<IncomingPacket> >::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<IncomingPacket> >::iterator i(_rxQueue.begin());i!=_rxQueue.end();) { + for(std::list< SharedPtr<IncomingPacket> >::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++); |