Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-12-25 14:39:48 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2013-05-11 10:22:56 (GMT) |
| commit | 927d62cc54c8a5087dba6b61afa9ad30dc528a23 (patch) | |
| tree | e67dc911bd30c0519d31a542d8e085bbb209879d /Swiften/Queries | |
| parent | 17b188343e7208b875af7af30d94f0bf948f6b93 (diff) | |
| download | swift-contrib-927d62cc54c8a5087dba6b61afa9ad30dc528a23.zip swift-contrib-927d62cc54c8a5087dba6b61afa9ad30dc528a23.tar.bz2 | |
File Transfer refactoring.
Allocate S5B server lazily.
Forward forts lazily.
Various state machine fixes.
Temporarily disabling S5B proxy support.
Change-Id: I3145e85a99b15a7e457306bbfbe9c0eb570191e4
Diffstat (limited to 'Swiften/Queries')
| -rw-r--r-- | Swiften/Queries/Request.cpp | 3 | ||||
| -rw-r--r-- | Swiften/Queries/Request.h | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Swiften/Queries/Request.cpp b/Swiften/Queries/Request.cpp index 422f36c..40c8f60 100644 --- a/Swiften/Queries/Request.cpp +++ b/Swiften/Queries/Request.cpp @@ -23,7 +23,7 @@ Request::Request(IQ::Type type, const JID& sender, const JID& receiver, boost::s Request::Request(IQ::Type type, const JID& sender, const JID& receiver, IQRouter* router) : router_(router), type_(type), sender_(sender), receiver_(receiver), sent_(false) { } -void Request::send() { +std::string Request::send() { assert(payload_); assert(!sent_); sent_ = true; @@ -43,6 +43,7 @@ void Request::send() { } router_->sendIQ(iq); + return id_; } bool Request::handleIQ(boost::shared_ptr<IQ> iq) { diff --git a/Swiften/Queries/Request.h b/Swiften/Queries/Request.h index 5e3a4b8..f17cc11 100644 --- a/Swiften/Queries/Request.h +++ b/Swiften/Queries/Request.h @@ -24,12 +24,21 @@ namespace Swift { */ class SWIFTEN_API Request : public IQHandler, public boost::enable_shared_from_this<Request> { public: - void send(); + std::string send(); const JID& getReceiver() const { return receiver_; } + /** + * Returns the ID of this request. + * This will only be set after send() is called. + */ + const std::string& getID() const { + return id_; + } + + protected: /** * Constructs a request of a certain type to a specific receiver, and attaches the given |