1 files changed, 149 insertions, 78 deletions
diff --git a/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.cpp b/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.cpp
index 53ad53a..7cb4cbb 100644
--- a/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.cpp
+++ b/Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.cpp
@@ -5,116 +5,187 @@
  */
 
 /*
- * 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/LocalJingleTransportCandidateGenerator.h>
 
+#include <memory>
 #include <vector>
 
-#include <boost/shared_ptr.hpp>
 #include <boost/bind.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
 
-#include <Swiften/Base/foreach.h>
 #include <Swiften/Base/Log.h>
 #include <Swiften/Elements/JingleS5BTransportPayload.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamProxiesManager.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamServerManager.h>
-#include <Swiften/FileTransfer/SOCKS5BytestreamServerInitializeRequest.h>
+#include <Swiften/FileTransfer/SOCKS5BytestreamServerPortForwardingUser.h>
+#include <Swiften/FileTransfer/SOCKS5BytestreamServerResourceUser.h>
 
 static const unsigned int LOCAL_PREFERENCE = 0;
 
 namespace Swift {
 
 LocalJingleTransportCandidateGenerator::LocalJingleTransportCandidateGenerator(
-		SOCKS5BytestreamServerManager* s5bServerManager,
-		SOCKS5BytestreamProxiesManager* s5bProxy, 
-		const JID& ownJID,
-		IDGenerator* idGenerator) : 
-			s5bServerManager(s5bServerManager),
-			s5bProxy(s5bProxy), 
-			ownJID(ownJID),
-			idGenerator(idGenerator) {
+        SOCKS5BytestreamServerManager* s5bServerManager,
+        SOCKS5BytestreamProxiesManager* s5bProxy,
+        const JID& ownJID,
+        IDGenerator* idGenerator,
+        const FileTransferOptions& options) :
+            s5bServerManager(s5bServerManager),
+            s5bProxy(s5bProxy),
+            ownJID(ownJID),
+            idGenerator(idGenerator),
+            triedServerInit_(false),
+            triedForwarding_(false),
+            triedProxyDiscovery_(false),
+            options_(options) {
 }
 
 LocalJingleTransportCandidateGenerator::~LocalJingleTransportCandidateGenerator() {
-	SWIFT_LOG_ASSERT(!s5bServerInitializeRequest, warning) << std::endl;
+    SWIFT_LOG_ASSERT(!s5bServerInitializeRequest, warning);
 }
 
 void LocalJingleTransportCandidateGenerator::start() {
-	assert(!s5bServerInitializeRequest);
-	s5bServerInitializeRequest = s5bServerManager->createInitializeRequest();
-	s5bServerInitializeRequest->onFinished.connect(
-			boost::bind(&LocalJingleTransportCandidateGenerator::handleS5BServerInitialized, this, _1));
-
-	s5bServerInitializeRequest->start();
+    assert(!s5bServerInitializeRequest);
+    if (options_.isDirectAllowed() || options_.isAssistedAllowed()) {
+        s5bServerResourceUser_ = s5bServerManager->aquireResourceUser();
+        if (s5bServerResourceUser_->isInitialized()) {
+            handleS5BServerInitialized(true);
+        }
+        else {
+            s5bServerResourceUser_->onSuccessfulInitialized.connect(boost::bind(&LocalJingleTransportCandidateGenerator::handleS5BServerInitialized, this, _1));
+        }
+    } else {
+        handleS5BServerInitialized(false);
+    }
+
+    if (options_.isProxiedAllowed()) {
+        s5bProxy->onDiscoveredProxiesChanged.connect(boost::bind(&LocalJingleTransportCandidateGenerator::handleDiscoveredProxiesChanged, this));
+        if (s5bProxy->getOrDiscoverS5BProxies().is_initialized()) {
+            handleDiscoveredProxiesChanged();
+        }
+    }
 }
 
 void LocalJingleTransportCandidateGenerator::stop() {
-	if (s5bServerInitializeRequest) {
-		s5bServerInitializeRequest->stop();
-		s5bServerInitializeRequest.reset();
-	}
+    s5bProxy->onDiscoveredProxiesChanged.disconnect(boost::bind(&LocalJingleTransportCandidateGenerator::handleDiscoveredProxiesChanged, this));
+    if (s5bServerPortForwardingUser_) {
+        s5bServerPortForwardingUser_->onSetup.disconnect(boost::bind(&LocalJingleTransportCandidateGenerator::handlePortForwardingSetup, this, _1));
+        s5bServerPortForwardingUser_.reset();
+    }
+    if (s5bServerResourceUser_) {
+        s5bServerResourceUser_->onSuccessfulInitialized.disconnect(boost::bind(&LocalJingleTransportCandidateGenerator::handleS5BServerInitialized, this, _1));
+        s5bServerResourceUser_.reset();
+    }
 }
 
 void LocalJingleTransportCandidateGenerator::handleS5BServerInitialized(bool success) {
-	std::vector<JingleS5BTransportPayload::Candidate> candidates;
-	if (success) {
-		// get direct candidates
-		std::vector<HostAddressPort> directCandidates = s5bServerManager->getHostAddressPorts();
-		foreach(HostAddressPort addressPort, directCandidates) {
-			JingleS5BTransportPayload::Candidate candidate;
-			candidate.type = JingleS5BTransportPayload::Candidate::DirectType;
-			candidate.jid = ownJID;
-			candidate.hostPort = addressPort;
-			candidate.priority = 65536 * 126 + LOCAL_PREFERENCE;
-			candidate.cid = idGenerator->generateID();
-			candidates.push_back(candidate);
-		}
-
-		// get assissted candidates
-		std::vector<HostAddressPort> assisstedCandidates = s5bServerManager->getAssistedHostAddressPorts();
-		foreach(HostAddressPort addressPort, assisstedCandidates) {
-			JingleS5BTransportPayload::Candidate candidate;
-			candidate.type = JingleS5BTransportPayload::Candidate::AssistedType;
-			candidate.jid = ownJID;
-			candidate.hostPort = addressPort;
-			candidate.priority = 65536 * 120 + LOCAL_PREFERENCE;
-			candidate.cid = idGenerator->generateID();
-			candidates.push_back(candidate);
-		}
-	}
-	else {
-		SWIFT_LOG(warning) << "Unable to start SOCKS5 server" << std::endl;
-	}
-
-	s5bServerInitializeRequest->stop();
-	s5bServerInitializeRequest.reset();
-
-	onLocalTransportCandidatesGenerated(candidates);
+    if (s5bServerResourceUser_) {
+        s5bServerResourceUser_->onSuccessfulInitialized.disconnect(boost::bind(&LocalJingleTransportCandidateGenerator::handleS5BServerInitialized, this, _1));
+    }
+    triedServerInit_ = true;
+    if (success) {
+        if (options_.isAssistedAllowed()) {
+            // try to setup port forwarding
+            s5bServerPortForwardingUser_ = s5bServerManager->aquirePortForwardingUser();
+            s5bServerPortForwardingUser_->onSetup.connect(boost::bind(&LocalJingleTransportCandidateGenerator::handlePortForwardingSetup, this, _1));
+            if (s5bServerPortForwardingUser_->isForwardingSetup()) {
+                handlePortForwardingSetup(true);
+            }
+        }
+    }
+    else {
+        SWIFT_LOG(warning) << "Unable to start SOCKS5 server";
+        if (s5bServerResourceUser_) {
+            s5bServerResourceUser_->onSuccessfulInitialized.disconnect(boost::bind(&LocalJingleTransportCandidateGenerator::handleS5BServerInitialized, this, _1));
+        }
+        s5bServerResourceUser_.reset();
+        handlePortForwardingSetup(false);
+    }
+    checkS5BCandidatesReady();
+}
+
+void LocalJingleTransportCandidateGenerator::handlePortForwardingSetup(bool /* success */) {
+    if (s5bServerPortForwardingUser_) {
+        s5bServerPortForwardingUser_->onSetup.disconnect(boost::bind(&LocalJingleTransportCandidateGenerator::handlePortForwardingSetup, this, _1));
+    }
+    triedForwarding_ = true;
+    checkS5BCandidatesReady();
+}
+
+void LocalJingleTransportCandidateGenerator::handleDiscoveredProxiesChanged() {
+    if (s5bProxy) {
+        s5bProxy->onDiscoveredProxiesChanged.disconnect(boost::bind(&LocalJingleTransportCandidateGenerator::handleDiscoveredProxiesChanged, this));
+    }
+    triedProxyDiscovery_ = true;
+    checkS5BCandidatesReady();
 }
 
-/*void LocalJingleTransportCandidateGenerator::handleS5BProxiesDiscovered() {
-	foreach(S5BProxyRequest::ref proxy, s5bProxiesDiscoverRequest->getS5BProxies()) {
-		if (proxy->getStreamHost()) { // FIXME: Added this test, because there were cases where this wasn't initialized. Investigate this. (Remko)
-			JingleS5BTransportPayload::Candidate candidate;
-			candidate.type = JingleS5BTransportPayload::Candidate::ProxyType;
-			candidate.jid = (*proxy->getStreamHost()).jid;
-			candidate.hostPort = (*proxy->getStreamHost()).addressPort;
-			candidate.priority = 65536 * 10 + LOCAL_PREFERENCE;
-			candidate.cid = idGenerator.generateID();
-			s5bCandidatesPayload->addCandidate(candidate);
-		}
-	}
-
-	haveS5BProxyCandidates = true;
-	s5bProxiesDiscoverRequest->stop();
-	s5bProxiesDiscoverRequest.reset();
-
-	checkS5BCandidatesReady();
-}*/
+void LocalJingleTransportCandidateGenerator::checkS5BCandidatesReady() {
+    if ((!options_.isDirectAllowed()  || (options_.isDirectAllowed()  && triedServerInit_)) &&
+        (!options_.isProxiedAllowed() || (options_.isProxiedAllowed() && triedProxyDiscovery_)) &&
+        (!options_.isAssistedAllowed()  || (options_.isAssistedAllowed()  && triedForwarding_))) {
+        emitOnLocalTransportCandidatesGenerated();
+    }
+}
+
+
+void LocalJingleTransportCandidateGenerator::emitOnLocalTransportCandidatesGenerated() {
+    std::vector<JingleS5BTransportPayload::Candidate> candidates;
+
+    if (options_.isDirectAllowed()) {
+        // get direct candidates
+        std::vector<HostAddressPort> directCandidates = s5bServerManager->getHostAddressPorts();
+        for(auto&& addressPort : directCandidates) {
+            if (addressPort.getAddress().getRawAddress().is_v6() &&
+                addressPort.getAddress().getRawAddress().to_v6().is_link_local()) {
+                continue;
+            }
+            JingleS5BTransportPayload::Candidate candidate;
+            candidate.type = JingleS5BTransportPayload::Candidate::DirectType;
+            candidate.jid = ownJID;
+            candidate.hostPort = addressPort;
+            candidate.priority = 65536 * 126 + LOCAL_PREFERENCE;
+            candidate.cid = idGenerator->generateID();
+            candidates.push_back(candidate);
+        }
+    }
+
+    if (options_.isAssistedAllowed()) {
+        // get assissted candidates
+        std::vector<HostAddressPort> assisstedCandidates = s5bServerManager->getAssistedHostAddressPorts();
+        for (auto&& addressPort : assisstedCandidates) {
+            JingleS5BTransportPayload::Candidate candidate;
+            candidate.type = JingleS5BTransportPayload::Candidate::AssistedType;
+            candidate.jid = ownJID;
+            candidate.hostPort = addressPort;
+            candidate.priority = 65536 * 120 + LOCAL_PREFERENCE;
+            candidate.cid = idGenerator->generateID();
+            candidates.push_back(candidate);
+        }
+    }
+
+    if (options_.isProxiedAllowed() && s5bProxy && s5bProxy->getOrDiscoverS5BProxies().is_initialized()) {
+        for (auto&& proxy : s5bProxy->getOrDiscoverS5BProxies().get()) {
+            if (proxy->getStreamHost()) { // FIXME: Added this test, because there were cases where this wasn't initialized. Investigate this. (Remko)
+                JingleS5BTransportPayload::Candidate candidate;
+                candidate.type = JingleS5BTransportPayload::Candidate::ProxyType;
+                candidate.jid = (*proxy->getStreamHost()).jid;
+                auto address = HostAddress::fromString((*proxy->getStreamHost()).host);
+                if (address) {
+                    candidate.hostPort = HostAddressPort(address.get(), (*proxy->getStreamHost()).port);
+                    candidate.priority = 65536 * 10 + LOCAL_PREFERENCE;
+                    candidate.cid = idGenerator->generateID();
+                    candidates.push_back(candidate);
+                }
+            }
+        }
+    }
+
+    onLocalTransportCandidatesGenerated(candidates);
+}
 
 }