Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-01-11 17:13:41 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-02-11 09:36:14 (GMT) |
| commit | a049c80f0862a994a76e8e63d71c633bce63f66a (patch) | |
| tree | c5fc7786d2d245c765067545bb9a0e433e58a3f9 /Swiften/FileTransfer/FileTransferTransporter.h | |
| parent | f176050a50fb846bbad3fb49d6b2f7a2c81e3589 (diff) | |
| download | swift-a049c80f0862a994a76e8e63d71c633bce63f66a.zip swift-a049c80f0862a994a76e8e63d71c633bce63f66a.tar.bz2 | |
Renable SOCKS5 bytestream proxy support for Jingle file transfers.
Test-Information:
Tested interoperability with Swiften using FileTransferTest.
Change-Id: Ic13a68a91cad199be0bfc8852ff43c25c7085f12
Diffstat (limited to 'Swiften/FileTransfer/FileTransferTransporter.h')
| -rw-r--r-- | Swiften/FileTransfer/FileTransferTransporter.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Swiften/FileTransfer/FileTransferTransporter.h b/Swiften/FileTransfer/FileTransferTransporter.h index 2116f0d..45eb811 100644 --- a/Swiften/FileTransfer/FileTransferTransporter.h +++ b/Swiften/FileTransfer/FileTransferTransporter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014 Isode Limited. + * Copyright (c) 2013-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -33,7 +33,7 @@ namespace Swift { virtual void stopGeneratingLocalCandidates() = 0; virtual void addRemoteCandidates( - const std::vector<JingleS5BTransportPayload::Candidate>&) = 0; + const std::vector<JingleS5BTransportPayload::Candidate>&, const std::string&) = 0; virtual void startTryingRemoteCandidates() = 0; virtual void stopTryingRemoteCandidates() = 0; @@ -45,15 +45,15 @@ namespace Swift { virtual boost::shared_ptr<TransportSession> createIBBReceiveSession( const std::string& sessionID, unsigned long long size, boost::shared_ptr<WriteBytestream>) = 0; virtual boost::shared_ptr<TransportSession> createRemoteCandidateSession( - boost::shared_ptr<ReadBytestream>) = 0; + boost::shared_ptr<ReadBytestream>, const JingleS5BTransportPayload::Candidate& candidate) = 0; virtual boost::shared_ptr<TransportSession> createRemoteCandidateSession( - boost::shared_ptr<WriteBytestream>) = 0; + boost::shared_ptr<WriteBytestream>, const JingleS5BTransportPayload::Candidate& candidate) = 0; virtual boost::shared_ptr<TransportSession> createLocalCandidateSession( - boost::shared_ptr<ReadBytestream>) = 0; + boost::shared_ptr<ReadBytestream>, const JingleS5BTransportPayload::Candidate& candidate) = 0; virtual boost::shared_ptr<TransportSession> createLocalCandidateSession( - boost::shared_ptr<WriteBytestream>) = 0; + boost::shared_ptr<WriteBytestream>, const JingleS5BTransportPayload::Candidate& candidate) = 0; - boost::signal<void (const std::string& /* sessionID */, const std::vector<JingleS5BTransportPayload::Candidate>&)> onLocalCandidatesGenerated; + boost::signal<void (const std::string& /* sessionID */, const std::vector<JingleS5BTransportPayload::Candidate>&, const std::string& /* dstAddr */)> onLocalCandidatesGenerated; boost::signal<void (const std::string& /* sessionID */, const boost::optional<JingleS5BTransportPayload::Candidate>&)> onRemoteCandidateSelectFinished; boost::signal<void (const std::string& /* sessionID */, boost::shared_ptr<ErrorPayload>)> onProxyActivated; }; |