Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-09-24 18:18:28 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-09-25 17:42:32 (GMT) |
| commit | 94f87ffc9769f2782b2267db813854b0fe752678 (patch) | |
| tree | 56244712ade2be0d4a0a093d7721d18050e74f87 /Swiften/FileTransfer/FileTransferManagerImpl.h | |
| parent | 4f62e5ec4b42929fe3c1a68667e63cb1b7a35509 (diff) | |
| download | swift-contrib-94f87ffc9769f2782b2267db813854b0fe752678.zip swift-contrib-94f87ffc9769f2782b2267db813854b0fe752678.tar.bz2 | |
File transfer changes.
- Introduce 'experimental' flag to conditionally compile FT.
- Use LibMiniUPNPC and NATPMP CPPDEFINES only locally in the classes that need them.
- Extract abstract interface from NAT traversal classes
- Avoid unit test warnings
Diffstat (limited to 'Swiften/FileTransfer/FileTransferManagerImpl.h')
| -rw-r--r-- | Swiften/FileTransfer/FileTransferManagerImpl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.h b/Swiften/FileTransfer/FileTransferManagerImpl.h index b38eaea..d1c3786 100644 --- a/Swiften/FileTransfer/FileTransferManagerImpl.h +++ b/Swiften/FileTransfer/FileTransferManagerImpl.h @@ -32,7 +32,7 @@ class IncomingFileTransferManager; class JingleSessionManager; class LocalJingleTransportCandidateGeneratorFactory; class OutgoingFileTransferManager; -class PlatformNATTraversalWorker; +class NATTraverser; class PresenceOracle; class ReadBytestream; class RemoteJingleTransportCandidateSelectorFactory; @@ -43,7 +43,7 @@ class TimerFactory; class FileTransferManagerImpl : public FileTransferManager { public: - FileTransferManagerImpl(const JID& ownFullJID, JingleSessionManager* jingleSessionManager, IQRouter* router, EntityCapsProvider* capsProvider, PresenceOracle* presOracle, ConnectionFactory* connectionFactory, ConnectionServerFactory* connectionServerFactory, TimerFactory* timerFactory, PlatformNATTraversalWorker* natTraversalWorker); + FileTransferManagerImpl(const JID& ownFullJID, JingleSessionManager* jingleSessionManager, IQRouter* router, EntityCapsProvider* capsProvider, PresenceOracle* presOracle, ConnectionFactory* connectionFactory, ConnectionServerFactory* connectionServerFactory, TimerFactory* timerFactory, NATTraverser* natTraverser); ~FileTransferManagerImpl(); void startListeningOnPort(int port); @@ -70,7 +70,7 @@ private: TimerFactory* timerFactory; ConnectionFactory* connectionFactory; ConnectionServerFactory* connectionServerFactory; - PlatformNATTraversalWorker* natTraversalWorker; + NATTraverser* natTraverser; SOCKS5BytestreamRegistry* bytestreamRegistry; SOCKS5BytestreamServer* bytestreamServer; SOCKS5BytestreamProxy* bytestreamProxy; |