Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-12-26 18:16:30 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-12-26 18:16:30 (GMT) |
| commit | 49d621c38effcdcc9aaafd3ee14082a2ae8278c4 (patch) | |
| tree | 1140379b7a6357e2d197f09235b79f76db9d8e0b /Swift/Controllers/DiscoServiceWalker.h | |
| parent | a8c4b779ad2795f76769f7dae2749ef869300bee (diff) | |
| download | swift-contrib-49d621c38effcdcc9aaafd3ee14082a2ae8278c4.zip swift-contrib-49d621c38effcdcc9aaafd3ee14082a2ae8278c4.tar.bz2 | |
Fixed crash when searching for users.
Resolves: #730
Diffstat (limited to 'Swift/Controllers/DiscoServiceWalker.h')
| -rw-r--r-- | Swift/Controllers/DiscoServiceWalker.h | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/Swift/Controllers/DiscoServiceWalker.h b/Swift/Controllers/DiscoServiceWalker.h index 5b2a47e..167174a 100644 --- a/Swift/Controllers/DiscoServiceWalker.h +++ b/Swift/Controllers/DiscoServiceWalker.h @@ -7,6 +7,7 @@ #pragma once #include <vector> +#include <set> #include <boost/shared_ptr.hpp> #include <Swiften/Base/boost_bsignals.h> @@ -15,6 +16,8 @@ #include <Swiften/Elements/DiscoInfo.h> #include <Swiften/Elements/DiscoItems.h> #include <Swiften/Elements/ErrorPayload.h> +#include <Swiften/Disco/GetDiscoInfoRequest.h> +#include <Swiften/Disco/GetDiscoItemsRequest.h> namespace Swift { class IQRouter; @@ -22,26 +25,44 @@ namespace Swift { * Recursively walk service discovery trees to find all services offered. * This stops on any disco item that's not reporting itself as a server. */ - class DiscoServiceWalker : public boost::signals::trackable { + class DiscoServiceWalker { public: DiscoServiceWalker(const JID& service, IQRouter* iqRouter, size_t maxSteps = 200); - /** Start the walk. Call this exactly once.*/ + + /** + * Start the walk. + * + * Call this exactly once. + */ void beginWalk(); + + /** + * End the walk. + */ + void endWalk(); + /** Emitted for each service found. */ boost::signal<void(const JID&, boost::shared_ptr<DiscoInfo>)> onServiceFound; + /** Emitted when walking is complete.*/ boost::signal<void()> onWalkComplete; + private: void handleReceivedDiscoItem(const JID& item); void walkNode(const JID& jid); void markNodeCompleted(const JID& jid); - void handleDiscoInfoResponse(boost::shared_ptr<DiscoInfo> info, ErrorPayload::ref error, const JID& jid); - void handleDiscoItemsResponse(boost::shared_ptr<DiscoItems> items, ErrorPayload::ref error, const JID& jid); + void handleDiscoInfoResponse(boost::shared_ptr<DiscoInfo> info, ErrorPayload::ref error, GetDiscoInfoRequest::ref request); + void handleDiscoItemsResponse(boost::shared_ptr<DiscoItems> items, ErrorPayload::ref error, GetDiscoItemsRequest::ref request); void handleDiscoError(const JID& jid, ErrorPayload::ref error); + + private: JID service_; IQRouter* iqRouter_; size_t maxSteps_; - std::vector<JID> servicesBeingSearched_; - std::vector<JID> searchedServices_; + bool active_; + std::set<JID> servicesBeingSearched_; + std::set<JID> searchedServices_; + std::set<GetDiscoInfoRequest::ref> pendingDiscoInfoRequests_; + std::set<GetDiscoItemsRequest::ref> pendingDiscoItemsRequests_; }; } |