Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-01-09 16:39:11 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-02-11 09:35:21 (GMT) |
| commit | 779f0d57bc9d90300aad0b1386dc937612ac35f4 (patch) | |
| tree | 2b7beb4db6af92eef45a6adaf0118d3ba149056b /Swiften/FileTransfer/FileTransferManagerImpl.h | |
| parent | 66567c962202920b0d6bc06029ed37565cd4a81c (diff) | |
| download | swift-779f0d57bc9d90300aad0b1386dc937612ac35f4.zip swift-779f0d57bc9d90300aad0b1386dc937612ac35f4.tar.bz2 | |
Support domain names in S5B proxy <streamhost> tags.
S5BProxyManager now resolves DNS names of proxy entries discovered via
service discovery.
Test-Information:
Tested against a XMPP installation that uses domain names in proxy entires.
Change-Id: I728243333ec6e62e86f088f2a7b6e222c629757b
Diffstat (limited to 'Swiften/FileTransfer/FileTransferManagerImpl.h')
| -rw-r--r-- | Swiften/FileTransfer/FileTransferManagerImpl.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.h b/Swiften/FileTransfer/FileTransferManagerImpl.h index 678261a..de6e857 100644 --- a/Swiften/FileTransfer/FileTransferManagerImpl.h +++ b/Swiften/FileTransfer/FileTransferManagerImpl.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2013 Isode Limited. + * Copyright (c) 2013-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -33,21 +33,22 @@ namespace Swift { class ConnectionFactory; class ConnectionServerFactory; - class SOCKS5BytestreamServerManager; + class CryptoProvider; + class DomainNameResolver; class EntityCapsProvider; + class FileTransferTransporterFactory; class IQRouter; class IncomingFileTransferManager; class JingleSessionManager; - class OutgoingFileTransferManager; class NATTraverser; + class NetworkEnvironment; + class OutgoingFileTransferManager; class PresenceOracle; class ReadBytestream; - class FileTransferTransporterFactory; - class SOCKS5BytestreamRegistry; class SOCKS5BytestreamProxiesManager; + class SOCKS5BytestreamRegistry; + class SOCKS5BytestreamServerManager; class TimerFactory; - class CryptoProvider; - class NetworkEnvironment; class SWIFTEN_API FileTransferManagerImpl : public FileTransferManager { public: @@ -60,6 +61,7 @@ namespace Swift { ConnectionFactory* connectionFactory, ConnectionServerFactory* connectionServerFactory, TimerFactory* timerFactory, + DomainNameResolver* domainNameResolver, NetworkEnvironment* networkEnvironment, NATTraverser* natTraverser, CryptoProvider* crypto); |