Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-21 21:36:09 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-21 21:46:41 (GMT) |
| commit | e96118247793fdf4b40dc61d7ebd2c19a64939a3 (patch) | |
| tree | 8737469cdb11ddf4ad5dc333ff87055548778cc9 /Swiften/Network/UnboundDomainNameResolver.h | |
| parent | ddebccbd59dd9cbd0c61efe55a09d74df8ec83c8 (diff) | |
| download | swift-e96118247793fdf4b40dc61d7ebd2c19a64939a3.zip swift-e96118247793fdf4b40dc61d7ebd2c19a64939a3.tar.bz2 | |
Fix libunbound support in Swiften which was broken since API change in 8ec22a9.
Test-Information:
Build for Android 4.3 (arm) and successfully ran checker in emulator VM.
Change-Id: Iedaae5df367ee86bfe2375879b0e0981deef9b0a
Diffstat (limited to 'Swiften/Network/UnboundDomainNameResolver.h')
| -rwxr-xr-x | Swiften/Network/UnboundDomainNameResolver.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Swiften/Network/UnboundDomainNameResolver.h b/Swiften/Network/UnboundDomainNameResolver.h index 0db8a66..6b78cf3 100755 --- a/Swiften/Network/UnboundDomainNameResolver.h +++ b/Swiften/Network/UnboundDomainNameResolver.h @@ -19,6 +19,7 @@ struct ub_result; namespace Swift { class EventLoop; + class IDNConverter; class TimerFactory; class UnboundDomainNameResolver; @@ -26,10 +27,10 @@ namespace Swift { class UnboundDomainNameResolver : public DomainNameResolver, public EventOwner, public boost::enable_shared_from_this<UnboundDomainNameResolver> { public: - UnboundDomainNameResolver(boost::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop); + UnboundDomainNameResolver(IDNConverter* idnConverter, boost::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop); virtual ~UnboundDomainNameResolver(); - virtual boost::shared_ptr<DomainNameServiceQuery> createServiceQuery(const std::string& name); + virtual boost::shared_ptr<DomainNameServiceQuery> createServiceQuery(const std::string& serviceLookupPrefix, const std::string& domain); virtual boost::shared_ptr<DomainNameAddressQuery> createAddressQuery(const std::string& name); static void unbound_callback_wrapper(void* data, int err, ub_result* result); @@ -41,6 +42,7 @@ namespace Swift { void processData(); private: + IDNConverter* idnConverter; boost::shared_ptr<EventOwner> eventOwner; boost::shared_ptr<boost::asio::io_service> ioService; boost::asio::posix::stream_descriptor ubDescriptior; |