summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-03-02 15:05:17 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-03-28 10:32:15 (GMT)
commit81f06ccf527dbbd3b9082d7c1a35e4e312a168e0 (patch)
treedcfd16db1077e8a26ee1e49265d76b06e06f972e /Swiften
parent2d13a4a47a076efde64671bc8eac2b4363a8790f (diff)
downloadswift-81f06ccf527dbbd3b9082d7c1a35e4e312a168e0.zip
swift-81f06ccf527dbbd3b9082d7c1a35e4e312a168e0.tar.bz2
Change IQ handling to allow non-final IQ handlers/responders
Previously all IQ handlers were final. The IQ handles were processed in last-added-first order and if the IQ payload matched the handler payload, the IQ would only be passed to that handler. This conflicts with our IBBReceiveSession. When running multiple concurrent file-transfers using multiple IBBReceiveSessions there are multiple IQ handlers for IBB content; one for every transfer. This commit allows a Responder to be set as non-final. In this case unhandled IQs will not be responded with an error but returned to the IQRouter so it can pass it to the next possible IQ handler. Test-Information: Tested with ConcurrentFileTransferTest with runs multiple IBB transfers in parallel. Change-Id: I8237e234cbe5c110deaa8c3d6ba303b65fd53d00
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/FileTransfer/IBBReceiveSession.cpp3
-rw-r--r--Swiften/Queries/Responder.h16
2 files changed, 15 insertions, 4 deletions
diff --git a/Swiften/FileTransfer/IBBReceiveSession.cpp b/Swiften/FileTransfer/IBBReceiveSession.cpp
index b4db9a6..ac58b34 100644
--- a/Swiften/FileTransfer/IBBReceiveSession.cpp
+++ b/Swiften/FileTransfer/IBBReceiveSession.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -21,6 +21,7 @@ namespace Swift {
class IBBReceiveSession::IBBResponder : public SetResponder<IBB> {
public:
IBBResponder(IBBReceiveSession* session, IQRouter* router) : SetResponder<IBB>(router), session(session), sequenceNumber(0), receivedSize(0) {
+ setFinal(false);
}
virtual bool handleSetRequest(const JID& from, const JID&, const std::string& id, IBB::ref ibb) {
diff --git a/Swiften/Queries/Responder.h b/Swiften/Queries/Responder.h
index 85b0589..84d232a 100644
--- a/Swiften/Queries/Responder.h
+++ b/Swiften/Queries/Responder.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -23,7 +23,7 @@ namespace Swift {
template<typename PAYLOAD_TYPE>
class Responder : public IQHandler {
public:
- Responder(IQRouter* router) : router_(router) {
+ Responder(IQRouter* router) : router_(router), isFinalResonder_(true) {
}
~Responder() {
@@ -98,6 +98,10 @@ namespace Swift {
return router_;
}
+ void setFinal(bool isFinal) {
+ isFinalResonder_ = isFinal;
+ }
+
private:
virtual bool handleIQ(boost::shared_ptr<IQ> iq) {
if (iq->getType() == IQ::Set || iq->getType() == IQ::Get) {
@@ -111,7 +115,12 @@ namespace Swift {
result = handleGetRequest(iq->getFrom(), iq->getTo(), iq->getID(), payload);
}
if (!result) {
- router_->sendIQ(IQ::createError(iq->getFrom(), iq->getID(), ErrorPayload::NotAllowed, ErrorPayload::Cancel));
+ if (isFinalResonder_) {
+ router_->sendIQ(IQ::createError(iq->getFrom(), iq->getID(), ErrorPayload::NotAllowed, ErrorPayload::Cancel));
+ }
+ else {
+ return false;
+ }
}
return true;
}
@@ -121,5 +130,6 @@ namespace Swift {
private:
IQRouter* router_;
+ bool isFinalResonder_;
};
}