Swiftdiff options
Diffstat (limited to 'Swiften/FileTransfer/DefaultFileTransferTransporter.cpp')
| -rw-r--r-- | Swiften/FileTransfer/DefaultFileTransferTransporter.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/FileTransfer/DefaultFileTransferTransporter.cpp b/Swiften/FileTransfer/DefaultFileTransferTransporter.cpp index c6987c0..ae3d7e0 100644 --- a/Swiften/FileTransfer/DefaultFileTransferTransporter.cpp +++ b/Swiften/FileTransfer/DefaultFileTransferTransporter.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2013-2016 Isode Limited. | 2 | * Copyright (c) 2013-2019 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -133,7 +133,7 @@ void DefaultFileTransferTransporter::handleActivateProxySessionResult(const std: | |||
| 133 | 133 | ||
| 134 | void DefaultFileTransferTransporter::startActivatingProxy(const JID& proxyServiceJID) { | 134 | void DefaultFileTransferTransporter::startActivatingProxy(const JID& proxyServiceJID) { |
| 135 | // activate proxy | 135 | // activate proxy |
| 136 | SWIFT_LOG(debug) << "Start activating proxy " << proxyServiceJID.toString() << " with sid = " << s5bSessionID << "." << std::endl; | 136 | SWIFT_LOG(debug) << "Start activating proxy " << proxyServiceJID.toString() << " with sid = " << s5bSessionID << "."; |
| 137 | S5BProxyRequest::ref proxyRequest = std::make_shared<S5BProxyRequest>(); | 137 | S5BProxyRequest::ref proxyRequest = std::make_shared<S5BProxyRequest>(); |
| 138 | proxyRequest->setSID(s5bSessionID); | 138 | proxyRequest->setSID(s5bSessionID); |
| 139 | proxyRequest->setActivate(role == Initiator ? responder : initiator); | 139 | proxyRequest->setActivate(role == Initiator ? responder : initiator); |
| @@ -207,7 +207,7 @@ std::shared_ptr<TransportSession> DefaultFileTransferTransporter::createLocalCan | |||
| 207 | transportSession = std::make_shared<S5BTransportSession<SOCKS5BytestreamClientSession> >(proxySession, stream); | 207 | transportSession = std::make_shared<S5BTransportSession<SOCKS5BytestreamClientSession> >(proxySession, stream); |
| 208 | } | 208 | } |
| 209 | else { | 209 | else { |
| 210 | SWIFT_LOG(error) << "Failed obtaining proxy session with candidate JID " << candidate.jid << " and dstAddr " << getLocalCandidateSOCKS5DstAddr() << "." << std::endl; | 210 | SWIFT_LOG(error) << "Failed obtaining proxy session with candidate JID " << candidate.jid << " and dstAddr " << getLocalCandidateSOCKS5DstAddr() << "."; |
| 211 | } | 211 | } |
| 212 | } | 212 | } |
| 213 | 213 | ||
| @@ -234,7 +234,7 @@ std::shared_ptr<TransportSession> DefaultFileTransferTransporter::createLocalCan | |||
| 234 | transportSession = std::make_shared<S5BTransportSession<SOCKS5BytestreamClientSession> >(proxySession, stream); | 234 | transportSession = std::make_shared<S5BTransportSession<SOCKS5BytestreamClientSession> >(proxySession, stream); |
| 235 | } | 235 | } |
| 236 | else { | 236 | else { |
| 237 | SWIFT_LOG(error) << "Failed obtaining proxy session with candidate JID " << candidate.jid << " and dstAddr " << getLocalCandidateSOCKS5DstAddr() << "." << std::endl; | 237 | SWIFT_LOG(error) << "Failed obtaining proxy session with candidate JID " << candidate.jid << " and dstAddr " << getLocalCandidateSOCKS5DstAddr() << "."; |
| 238 | } | 238 | } |
| 239 | } | 239 | } |
| 240 | 240 | ||
| @@ -255,11 +255,11 @@ std::string DefaultFileTransferTransporter::getSOCKS5DstAddr() const { | |||
| 255 | std::string result; | 255 | std::string result; |
| 256 | if (role == Initiator) { | 256 | if (role == Initiator) { |
| 257 | result = getInitiatorCandidateSOCKS5DstAddr(); | 257 | result = getInitiatorCandidateSOCKS5DstAddr(); |
| 258 | SWIFT_LOG(debug) << "Initiator S5B DST.ADDR = " << s5bSessionID << " + " << initiator.toString() << " + " << responder.toString() << " : " << result << std::endl; | 258 | SWIFT_LOG(debug) << "Initiator S5B DST.ADDR = " << s5bSessionID << " + " << initiator.toString() << " + " << responder.toString() << " : " << result; |
| 259 | } | 259 | } |
| 260 | else { | 260 | else { |
| 261 | result = getResponderCandidateSOCKS5DstAddr(); | 261 | result = getResponderCandidateSOCKS5DstAddr(); |
| 262 | SWIFT_LOG(debug) << "Responder S5B DST.ADDR = " << s5bSessionID << " + " << responder.toString() << " + " << initiator.toString() << " : " << result << std::endl; | 262 | SWIFT_LOG(debug) << "Responder S5B DST.ADDR = " << s5bSessionID << " + " << responder.toString() << " + " << initiator.toString() << " : " << result; |
| 263 | } | 263 | } |
| 264 | return result; | 264 | return result; |
| 265 | } | 265 | } |