diff options
author | Remko Tronçon <git@el-tramo.be> | 2011-08-26 20:21:52 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2011-08-26 20:21:52 (GMT) |
commit | 9a80a4b67f8fd86b3a2f5bccef3c0cd59dd83d75 (patch) | |
tree | a7304cd58652380926c2e1ebf225f7a9beed229b /Swiften/Queries/Request.cpp | |
parent | 946a94332761a058c6842e543d7e625bc5e9c9e1 (diff) | |
download | swift-contrib-9a80a4b67f8fd86b3a2f5bccef3c0cd59dd83d75.zip swift-contrib-9a80a4b67f8fd86b3a2f5bccef3c0cd59dd83d75.tar.bz2 |
Don't consider Get and Set requests as Response results.
Release-Notes: Fixed a problem where we would treat incoming queries with IDs clashing with pending requests as errors.
Diffstat (limited to 'Swiften/Queries/Request.cpp')
-rw-r--r-- | Swiften/Queries/Request.cpp | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/Swiften/Queries/Request.cpp b/Swiften/Queries/Request.cpp index 6c47725..a77cf49 100644 --- a/Swiften/Queries/Request.cpp +++ b/Swiften/Queries/Request.cpp @@ -39,25 +39,27 @@ void Request::send() { bool Request::handleIQ(boost::shared_ptr<IQ> iq) { bool handled = false; - if (sent_ && iq->getID() == id_) { - if (iq->getType() == IQ::Result) { - boost::shared_ptr<Payload> payload = iq->getPayloadOfSameType(payload_); - if (!payload && boost::dynamic_pointer_cast<RawXMLPayload>(payload_) && !iq->getPayloads().empty()) { - payload = iq->getPayloads().front(); - } - handleResponse(payload, ErrorPayload::ref()); - } - else { - ErrorPayload::ref errorPayload = iq->getPayload<ErrorPayload>(); - if (errorPayload) { - handleResponse(boost::shared_ptr<Payload>(), errorPayload); + if (iq->getType() == IQ::Result || iq->getType() == IQ::Error) { + if (sent_ && iq->getID() == id_) { + if (iq->getType() == IQ::Result) { + boost::shared_ptr<Payload> payload = iq->getPayloadOfSameType(payload_); + if (!payload && boost::dynamic_pointer_cast<RawXMLPayload>(payload_) && !iq->getPayloads().empty()) { + payload = iq->getPayloads().front(); + } + handleResponse(payload, ErrorPayload::ref()); } else { - handleResponse(boost::shared_ptr<Payload>(), ErrorPayload::ref(new ErrorPayload(ErrorPayload::UndefinedCondition))); + ErrorPayload::ref errorPayload = iq->getPayload<ErrorPayload>(); + if (errorPayload) { + handleResponse(boost::shared_ptr<Payload>(), errorPayload); + } + else { + handleResponse(boost::shared_ptr<Payload>(), ErrorPayload::ref(new ErrorPayload(ErrorPayload::UndefinedCondition))); + } } + router_->removeHandler(this); + handled = true; } - router_->removeHandler(this); - handled = true; } return handled; } |