summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-06-11 20:22:04 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-06-11 20:25:09 (GMT)
commitaa32913718442aecb7b22e891bd6f1a1ceca9d8c (patch)
tree297ff941043aa63da0bad5d1094220f093253b4d /Swiften/Queries/Request.cpp
parenta17bb9f842aca9ad9b414237ad576aa7a887349e (diff)
downloadswift-aa32913718442aecb7b22e891bd6f1a1ceca9d8c.zip
swift-aa32913718442aecb7b22e891bd6f1a1ceca9d8c.tar.bz2
Do not allow a request response before it is sent.
Diffstat (limited to 'Swiften/Queries/Request.cpp')
-rw-r--r--Swiften/Queries/Request.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Swiften/Queries/Request.cpp b/Swiften/Queries/Request.cpp
index 609d67b..189bbaa 100644
--- a/Swiften/Queries/Request.cpp
+++ b/Swiften/Queries/Request.cpp
@@ -4,7 +4,7 @@
namespace Swift {
-Request::Request(IQ::Type type, const JID& receiver, boost::shared_ptr<Payload> payload, IQRouter* router, AutoDeleteBehavior autoDeleteBehavior) : IQHandler(router), type_(type), receiver_(receiver), payload_(payload), autoDeleteBehavior_(autoDeleteBehavior) {
+Request::Request(IQ::Type type, const JID& receiver, boost::shared_ptr<Payload> payload, IQRouter* router, AutoDeleteBehavior autoDeleteBehavior) : IQHandler(router), type_(type), receiver_(receiver), payload_(payload), autoDeleteBehavior_(autoDeleteBehavior), sent_(false) {
id_ = getRouter()->getNewIQID();
}
@@ -13,12 +13,13 @@ void Request::send() {
iq->setTo(receiver_);
iq->addPayload(payload_);
iq->setID(id_);
+ sent_ = true;
getRouter()->sendIQ(iq);
}
bool Request::handleIQ(boost::shared_ptr<IQ> iq) {
bool handled = false;
- if (iq->getID() == id_) {
+ if (sent_ && iq->getID() == id_) {
if (iq->getType() == IQ::Result) {
handleResponse(iq->getPayloadOfSameType(payload_), boost::optional<Error>());
}