1 files changed, 54 insertions, 52 deletions
diff --git a/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.cpp b/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.cpp
index 1e96b22..4023be3 100644
--- a/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.cpp
+++ b/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.cpp
@@ -5,91 +5,93 @@
  */
 
 /*
- * Copyright (c) 2013 Remko Tronçon
- * Licensed under the GNU General Public License.
+ * Copyright (c) 2013-2019 Isode Limited.
+ * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h>
 
-#include <boost/smart_ptr/make_shared.hpp>
+#include <memory>
+
 #include <boost/bind.hpp>
+#include <boost/signals2.hpp>
 
 #include <Swiften/Base/Log.h>
-#include <Swiften/Base/boost_bsignals.h>
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Elements/JingleS5BTransportPayload.h>
-#include <Swiften/Network/ConnectionFactory.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamRegistry.h>
+#include <Swiften/Network/ConnectionFactory.h>
 
 using namespace Swift;
 
 RemoteJingleTransportCandidateSelector::RemoteJingleTransportCandidateSelector(
-		ConnectionFactory* connectionFactory, 
-		TimerFactory* timerFactory) :
-			connectionFactory(connectionFactory), 
-			timerFactory(timerFactory) {
+        ConnectionFactory* connectionFactory,
+        TimerFactory* timerFactory,
+        const FileTransferOptions& options) :
+            connectionFactory(connectionFactory),
+            timerFactory(timerFactory),
+            options(options) {
 }
 
 RemoteJingleTransportCandidateSelector::~RemoteJingleTransportCandidateSelector() {
 }
 
 void RemoteJingleTransportCandidateSelector::addCandidates(
-		const std::vector<JingleS5BTransportPayload::Candidate>& candidates) {
-	foreach(JingleS5BTransportPayload::Candidate c,  candidates) {
-		this->candidates.push(c);
-	}
+        const std::vector<JingleS5BTransportPayload::Candidate>& candidates) {
+    for (auto&& c : candidates) {
+        this->candidates.push(c);
+    }
 }
 
 void RemoteJingleTransportCandidateSelector::startSelectingCandidate() {
-	tryNextCandidate();
+    tryNextCandidate();
 }
 
 void RemoteJingleTransportCandidateSelector::stopSelectingCandidate() {
-	if (s5bSession) {
-		sessionReadyConnection.disconnect();
-		s5bSession->stop();
-	}
+    if (s5bSession) {
+        sessionReadyConnection.disconnect();
+        s5bSession->stop();
+    }
 }
 
 void RemoteJingleTransportCandidateSelector::tryNextCandidate() {
-	if (candidates.empty()) {
-		SWIFT_LOG(debug) << "No more candidates" << std::endl;
-		onCandidateSelectFinished(
-				boost::optional<JingleS5BTransportPayload::Candidate>(), boost::shared_ptr<SOCKS5BytestreamClientSession>());
-	} 
-	else {
-		lastCandidate = candidates.top();
-		candidates.pop();
-		SWIFT_LOG(debug) << "Trying candidate " << lastCandidate.cid << std::endl;
-		if (lastCandidate.type == JingleS5BTransportPayload::Candidate::DirectType 
-				|| lastCandidate.type == JingleS5BTransportPayload::Candidate::AssistedType 
-				|| lastCandidate.type == JingleS5BTransportPayload::Candidate::ProxyType ) {
-			boost::shared_ptr<Connection> connection = connectionFactory->createConnection();
-			s5bSession = boost::make_shared<SOCKS5BytestreamClientSession>(
-					connection, lastCandidate.hostPort, socks5DstAddr, timerFactory);
-			sessionReadyConnection = s5bSession->onSessionReady.connect(
-					boost::bind(&RemoteJingleTransportCandidateSelector::handleSessionReady, this, _1));
-			s5bSession->start();
-		} 
-		else {
-			SWIFT_LOG(debug) << "Can't handle this type of candidate" << std::endl;
-			tryNextCandidate();
-		}
-	}
+    if (candidates.empty()) {
+        SWIFT_LOG(debug) << "No more candidates";
+        onCandidateSelectFinished(
+                boost::optional<JingleS5BTransportPayload::Candidate>(), std::shared_ptr<SOCKS5BytestreamClientSession>());
+    }
+    else {
+        lastCandidate = candidates.top();
+        candidates.pop();
+        SWIFT_LOG(debug) << "Trying candidate " << lastCandidate.cid;
+        if ((lastCandidate.type == JingleS5BTransportPayload::Candidate::DirectType && options.isDirectAllowed()) ||
+            (lastCandidate.type == JingleS5BTransportPayload::Candidate::AssistedType && options.isAssistedAllowed()) ||
+            (lastCandidate.type == JingleS5BTransportPayload::Candidate::ProxyType && options.isProxiedAllowed())) {
+            std::shared_ptr<Connection> connection = connectionFactory->createConnection();
+            s5bSession = std::make_shared<SOCKS5BytestreamClientSession>(
+                    connection, lastCandidate.hostPort, socks5DstAddr, timerFactory);
+            sessionReadyConnection = s5bSession->onSessionReady.connect(
+                    boost::bind(&RemoteJingleTransportCandidateSelector::handleSessionReady, this, _1));
+            s5bSession->start();
+        }
+        else {
+            SWIFT_LOG(debug) << "Can't handle this type of candidate";
+            tryNextCandidate();
+        }
+    }
 }
 
 void RemoteJingleTransportCandidateSelector::handleSessionReady(bool error) {
-	sessionReadyConnection.disconnect();
-	if (error) {
-		s5bSession.reset();
-		tryNextCandidate();
-	}
-	else {
-		onCandidateSelectFinished(lastCandidate, s5bSession);
-	}
+    sessionReadyConnection.disconnect();
+    if (error) {
+        s5bSession.reset();
+        tryNextCandidate();
+    }
+    else {
+        onCandidateSelectFinished(lastCandidate, s5bSession);
+    }
 }
 
 void RemoteJingleTransportCandidateSelector::setSOCKS5DstAddr(const std::string& socks5DstAddr) {
-	this->socks5DstAddr = socks5DstAddr;
+    this->socks5DstAddr = socks5DstAddr;
 }