Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-06-16 20:41:48 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-06-17 16:33:34 (GMT) |
| commit | f2e3bfbe2ed1b8f35aa958041ee766f9d8ddf31e (patch) | |
| tree | a6d28ee7ef03dd4538154c29b988e33b01ceb6ed /Swiften/Queries/IQRouter.cpp | |
| parent | f1c690a5352ee77282bbbd145a3fe0137aceb160 (diff) | |
| download | swift-f2e3bfbe2ed1b8f35aa958041ee766f9d8ddf31e.zip swift-f2e3bfbe2ed1b8f35aa958041ee766f9d8ddf31e.tar.bz2 | |
Delay IQHandler removal in IQRouter during IQ handling.
Diffstat (limited to 'Swiften/Queries/IQRouter.cpp')
| -rw-r--r-- | Swiften/Queries/IQRouter.cpp | 44 |
1 files changed, 29 insertions, 15 deletions
diff --git a/Swiften/Queries/IQRouter.cpp b/Swiften/Queries/IQRouter.cpp index 671566a..b20d344 100644 --- a/Swiften/Queries/IQRouter.cpp +++ b/Swiften/Queries/IQRouter.cpp @@ -10,20 +10,18 @@ namespace Swift { -namespace { - void noop(IQHandler*) {} - struct PointerEquals { - PointerEquals(IQHandler* handler) : handler_(handler) {} - bool operator()(boost::shared_ptr<IQHandler> o) { return handler_ == o.get(); } - IQHandler* handler_; - }; -} +static void noop(IQHandler*) {} -IQRouter::IQRouter(IQChannel* channel) : channel_(channel) { +IQRouter::IQRouter(IQChannel* channel) : channel_(channel), queueRemoves_(false) { channel->onIQReceived.connect(boost::bind(&IQRouter::handleIQ, this, _1)); } +IQRouter::~IQRouter() { +} + void IQRouter::handleIQ(boost::shared_ptr<IQ> iq) { + queueRemoves_ = true; + bool handled = false; foreach(boost::shared_ptr<IQHandler> handler, handlers_) { handled |= handler->handleIQ(iq); @@ -34,22 +32,38 @@ void IQRouter::handleIQ(boost::shared_ptr<IQ> iq) { if (!handled && (iq->getType() == IQ::Get || iq->getType() == IQ::Set) ) { channel_->sendIQ(IQ::createError(iq->getFrom(), iq->getID(), Error::FeatureNotImplemented, Error::Cancel)); } + + processPendingRemoves(); + + queueRemoves_ = false; } -void IQRouter::addHandler(IQHandler* handler) { - handlers_.push_back(boost::shared_ptr<IQHandler>(handler, noop)); +void IQRouter::processPendingRemoves() { + foreach(boost::shared_ptr<IQHandler> handler, queuedRemoves_) { + handlers_.erase(std::remove(handlers_.begin(), handlers_.end(), handler), handlers_.end()); + } + queuedRemoves_.clear(); } -void IQRouter::addHandler(boost::shared_ptr<IQHandler> handler) { - handlers_.push_back(handler); +void IQRouter::addHandler(IQHandler* handler) { + addHandler(boost::shared_ptr<IQHandler>(handler, noop)); } void IQRouter::removeHandler(IQHandler* handler) { - handlers_.erase(std::remove_if(handlers_.begin(), handlers_.end(), PointerEquals(handler)), handlers_.end()); + removeHandler(boost::shared_ptr<IQHandler>(handler, noop)); +} + +void IQRouter::addHandler(boost::shared_ptr<IQHandler> handler) { + handlers_.push_back(handler); } void IQRouter::removeHandler(boost::shared_ptr<IQHandler> handler) { - handlers_.erase(std::remove(handlers_.begin(), handlers_.end(), handler)); + if (queueRemoves_) { + queuedRemoves_.push_back(handler); + } + else { + handlers_.erase(std::remove(handlers_.begin(), handlers_.end(), handler), handlers_.end()); + } } void IQRouter::sendIQ(boost::shared_ptr<IQ> iq) { |