diff options
Diffstat (limited to 'Swiften/Queries/IQRouter.cpp')
-rw-r--r-- | Swiften/Queries/IQRouter.cpp | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/Swiften/Queries/IQRouter.cpp b/Swiften/Queries/IQRouter.cpp index 25ae3ac..b32cdf1 100644 --- a/Swiften/Queries/IQRouter.cpp +++ b/Swiften/Queries/IQRouter.cpp @@ -19,76 +19,76 @@ namespace Swift { static void noop(IQHandler*) {} IQRouter::IQRouter(IQChannel* channel) : channel_(channel), queueRemoves_(false) { - channel->onIQReceived.connect(boost::bind(&IQRouter::handleIQ, this, _1)); + channel->onIQReceived.connect(boost::bind(&IQRouter::handleIQ, this, _1)); } IQRouter::~IQRouter() { - channel_->onIQReceived.disconnect(boost::bind(&IQRouter::handleIQ, this, _1)); + channel_->onIQReceived.disconnect(boost::bind(&IQRouter::handleIQ, this, _1)); } bool IQRouter::isAvailable() { - return channel_->isAvailable(); + return channel_->isAvailable(); } void IQRouter::handleIQ(boost::shared_ptr<IQ> iq) { - queueRemoves_ = true; - - bool handled = false; - // Go through the handlers in reverse order, to give precedence to the last added handler - std::vector<boost::shared_ptr<IQHandler> >::const_reverse_iterator i = handlers_.rbegin(); - std::vector<boost::shared_ptr<IQHandler> >::const_reverse_iterator rend = handlers_.rend(); - for (; i != rend; ++i) { - handled |= (*i)->handleIQ(iq); - if (handled) { - break; - } - } - if (!handled && (iq->getType() == IQ::Get || iq->getType() == IQ::Set) ) { - sendIQ(IQ::createError(iq->getFrom(), iq->getID(), ErrorPayload::FeatureNotImplemented, ErrorPayload::Cancel)); - } - - processPendingRemoves(); - - queueRemoves_ = false; + queueRemoves_ = true; + + bool handled = false; + // Go through the handlers in reverse order, to give precedence to the last added handler + std::vector<boost::shared_ptr<IQHandler> >::const_reverse_iterator i = handlers_.rbegin(); + std::vector<boost::shared_ptr<IQHandler> >::const_reverse_iterator rend = handlers_.rend(); + for (; i != rend; ++i) { + handled |= (*i)->handleIQ(iq); + if (handled) { + break; + } + } + if (!handled && (iq->getType() == IQ::Get || iq->getType() == IQ::Set) ) { + sendIQ(IQ::createError(iq->getFrom(), iq->getID(), ErrorPayload::FeatureNotImplemented, ErrorPayload::Cancel)); + } + + processPendingRemoves(); + + queueRemoves_ = false; } void IQRouter::processPendingRemoves() { - foreach(boost::shared_ptr<IQHandler> handler, queuedRemoves_) { - erase(handlers_, handler); - } - queuedRemoves_.clear(); + foreach(boost::shared_ptr<IQHandler> handler, queuedRemoves_) { + erase(handlers_, handler); + } + queuedRemoves_.clear(); } void IQRouter::addHandler(IQHandler* handler) { - addHandler(boost::shared_ptr<IQHandler>(handler, noop)); + addHandler(boost::shared_ptr<IQHandler>(handler, noop)); } void IQRouter::removeHandler(IQHandler* handler) { - removeHandler(boost::shared_ptr<IQHandler>(handler, noop)); + removeHandler(boost::shared_ptr<IQHandler>(handler, noop)); } void IQRouter::addHandler(boost::shared_ptr<IQHandler> handler) { - handlers_.push_back(handler); + handlers_.push_back(handler); } void IQRouter::removeHandler(boost::shared_ptr<IQHandler> handler) { - if (queueRemoves_) { - queuedRemoves_.push_back(handler); - } - else { - erase(handlers_, handler); - } + if (queueRemoves_) { + queuedRemoves_.push_back(handler); + } + else { + erase(handlers_, handler); + } } void IQRouter::sendIQ(boost::shared_ptr<IQ> iq) { - if (from_.isValid() && !iq->getFrom().isValid()) { - iq->setFrom(from_); - } - channel_->sendIQ(iq); + if (from_.isValid() && !iq->getFrom().isValid()) { + iq->setFrom(from_); + } + channel_->sendIQ(iq); } std::string IQRouter::getNewIQID() { - return channel_->getNewIQID(); + return channel_->getNewIQID(); } } |