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/IncomingJingleFileTransfer.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/IncomingJingleFileTransfer.h')
| -rw-r--r-- | Swiften/FileTransfer/IncomingJingleFileTransfer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.h b/Swiften/FileTransfer/IncomingJingleFileTransfer.h index 7fc22f4..9820e34 100644 --- a/Swiften/FileTransfer/IncomingJingleFileTransfer.h +++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2014 Isode Limited. + * Copyright (c) 2010-2015 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ @@ -76,7 +76,8 @@ namespace Swift { virtual void handleLocalTransportCandidatesGenerated( const std::string& s5bSessionID, - const std::vector<JingleS5BTransportPayload::Candidate>&) SWIFTEN_OVERRIDE; + const std::vector<JingleS5BTransportPayload::Candidate>&, + const std::string& dstAddr) SWIFTEN_OVERRIDE; void handleWriteStreamDataReceived(const std::vector<unsigned char>& data); void stopActiveTransport(); |