summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.cpp')
-rw-r--r--Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.cpp b/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.cpp
index 56013ca..4023be3 100644
--- a/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.cpp
+++ b/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.cpp
@@ -5,7 +5,7 @@
5 */ 5 */
6 6
7/* 7/*
8 * Copyright (c) 2013-2016 Isode Limited. 8 * Copyright (c) 2013-2019 Isode Limited.
9 * All rights reserved. 9 * All rights reserved.
10 * See the COPYING file for more information. 10 * See the COPYING file for more information.
11 */ 11 */
@@ -56,14 +56,14 @@ void RemoteJingleTransportCandidateSelector::stopSelectingCandidate() {
56 56
57void RemoteJingleTransportCandidateSelector::tryNextCandidate() { 57void RemoteJingleTransportCandidateSelector::tryNextCandidate() {
58 if (candidates.empty()) { 58 if (candidates.empty()) {
59 SWIFT_LOG(debug) << "No more candidates" << std::endl; 59 SWIFT_LOG(debug) << "No more candidates";
60 onCandidateSelectFinished( 60 onCandidateSelectFinished(
61 boost::optional<JingleS5BTransportPayload::Candidate>(), std::shared_ptr<SOCKS5BytestreamClientSession>()); 61 boost::optional<JingleS5BTransportPayload::Candidate>(), std::shared_ptr<SOCKS5BytestreamClientSession>());
62 } 62 }
63 else { 63 else {
64 lastCandidate = candidates.top(); 64 lastCandidate = candidates.top();
65 candidates.pop(); 65 candidates.pop();
66 SWIFT_LOG(debug) << "Trying candidate " << lastCandidate.cid << std::endl; 66 SWIFT_LOG(debug) << "Trying candidate " << lastCandidate.cid;
67 if ((lastCandidate.type == JingleS5BTransportPayload::Candidate::DirectType && options.isDirectAllowed()) || 67 if ((lastCandidate.type == JingleS5BTransportPayload::Candidate::DirectType && options.isDirectAllowed()) ||
68 (lastCandidate.type == JingleS5BTransportPayload::Candidate::AssistedType && options.isAssistedAllowed()) || 68 (lastCandidate.type == JingleS5BTransportPayload::Candidate::AssistedType && options.isAssistedAllowed()) ||
69 (lastCandidate.type == JingleS5BTransportPayload::Candidate::ProxyType && options.isProxiedAllowed())) { 69 (lastCandidate.type == JingleS5BTransportPayload::Candidate::ProxyType && options.isProxiedAllowed())) {
@@ -75,7 +75,7 @@ void RemoteJingleTransportCandidateSelector::tryNextCandidate() {
75 s5bSession->start(); 75 s5bSession->start();
76 } 76 }
77 else { 77 else {
78 SWIFT_LOG(debug) << "Can't handle this type of candidate" << std::endl; 78 SWIFT_LOG(debug) << "Can't handle this type of candidate";
79 tryNextCandidate(); 79 tryNextCandidate();
80 } 80 }
81 } 81 }