Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2013-04-26 20:07:58 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2013-04-27 11:02:06 (GMT) |
| commit | 5d8c328e236f57d7390d32f9ea7bd17a31e1e740 (patch) | |
| tree | bebe606707a6b835fe3fd15e694d629b5e420947 /Swiften/FileTransfer/SOCKS5BytestreamServer.h | |
| parent | aa131405927fc7f597ed06aff71abb0a30b59926 (diff) | |
| download | swift-5d8c328e236f57d7390d32f9ea7bd17a31e1e740.zip swift-5d8c328e236f57d7390d32f9ea7bd17a31e1e740.tar.bz2 | |
Removing third-party hash implementations.
Using library/platform implementation instead.
Change-Id: I2457c2dad80e6fdda023a7f31c3906ff10fe09ed
Diffstat (limited to 'Swiften/FileTransfer/SOCKS5BytestreamServer.h')
| -rw-r--r-- | Swiften/FileTransfer/SOCKS5BytestreamServer.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamServer.h b/Swiften/FileTransfer/SOCKS5BytestreamServer.h index 6bb598e..b19ae90 100644 --- a/Swiften/FileTransfer/SOCKS5BytestreamServer.h +++ b/Swiften/FileTransfer/SOCKS5BytestreamServer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Remko Tronçon + * Copyright (c) 2010-2013 Remko Tronçon * Licensed under the GNU General Public License v3. * See Documentation/Licenses/GPLv3.txt for more information. */ @@ -17,10 +17,11 @@ namespace Swift { class SOCKS5BytestreamServerSession; + class CryptoProvider; class SOCKS5BytestreamServer { public: - SOCKS5BytestreamServer(boost::shared_ptr<ConnectionServer> connectionServer, SOCKS5BytestreamRegistry* registry); + SOCKS5BytestreamServer(boost::shared_ptr<ConnectionServer> connectionServer, SOCKS5BytestreamRegistry* registry, CryptoProvider* crypto); HostAddressPort getAddressPort() const; @@ -36,13 +37,14 @@ namespace Swift { private: void handleNewConnection(boost::shared_ptr<Connection> connection); - static std::string getSOCKSDestinationAddress(const std::string& id, const JID& from, const JID& to); + std::string getSOCKSDestinationAddress(const std::string& id, const JID& from, const JID& to); private: friend class SOCKS5BytestreamServerSession; boost::shared_ptr<ConnectionServer> connectionServer; SOCKS5BytestreamRegistry* registry; + CryptoProvider* crypto; std::vector<boost::shared_ptr<SOCKS5BytestreamServerSession> > sessions; }; } |