Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-08-28 10:01:54 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-08-28 10:01:54 (GMT) |
| commit | b1a9a1b61ebce0f64d656006a85607c8c8491f4a (patch) | |
| tree | a3157084893c6fa0f41f85a4de1b36f280334c02 /Swiften/Queries/IQRouter.h | |
| parent | 66f820c2c7e2d7c6d883c995bf7b2da37aa963c7 (diff) | |
| parent | 2faca4242e4de2568eb917df83fd1b9c21f33897 (diff) | |
| download | swift-b1a9a1b61ebce0f64d656006a85607c8c8491f4a.zip swift-b1a9a1b61ebce0f64d656006a85607c8c8491f4a.tar.bz2 | |
Merge branch 'swift-1.x'
* swift-1.x:
Remove relaxation of not checking JIDs if the IQRouter's JID isn't set.
Fixed Request::isAccountJID().
Check sender on incoming IQ responses.
Diffstat (limited to 'Swiften/Queries/IQRouter.h')
| -rw-r--r-- | Swiften/Queries/IQRouter.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Swiften/Queries/IQRouter.h b/Swiften/Queries/IQRouter.h index 80d623c..167cb8f 100644 --- a/Swiften/Queries/IQRouter.h +++ b/Swiften/Queries/IQRouter.h @@ -22,6 +22,20 @@ namespace Swift { ~IQRouter(); /** + * Sets the JID of this IQ router. + * + * This JID is used by requests to check whether incoming + * results are addressed correctly. + */ + void setJID(const JID& jid) { + jid_ = jid; + } + + const JID& getJID() { + return jid_; + } + + /** * Sets the 'from' JID for all outgoing IQ stanzas. * * By default, IQRouter does not add a from to IQ stanzas, since @@ -55,6 +69,7 @@ namespace Swift { private: IQChannel* channel_; + JID jid_; JID from_; std::vector< boost::shared_ptr<IQHandler> > handlers_; std::vector< boost::shared_ptr<IQHandler> > queuedRemoves_; |