1 files changed, 183 insertions, 183 deletions
diff --git a/Swiften/FileTransfer/DefaultFileTransferTransporter.cpp b/Swiften/FileTransfer/DefaultFileTransferTransporter.cpp
index 1e68bc6..b54f1c1 100644
--- a/Swiften/FileTransfer/DefaultFileTransferTransporter.cpp
+++ b/Swiften/FileTransfer/DefaultFileTransferTransporter.cpp
@@ -33,268 +33,268 @@
 using namespace Swift;
 
 DefaultFileTransferTransporter::DefaultFileTransferTransporter(
-		const JID& initiator, 
-		const JID& responder,
-		Role role,
-		SOCKS5BytestreamRegistry* s5bRegistry,
-		SOCKS5BytestreamServerManager* s5bServerManager,
-		SOCKS5BytestreamProxiesManager* s5bProxy, 
-		IDGenerator* idGenerator, 
-		ConnectionFactory* connectionFactory, 
-		TimerFactory* timerFactory, 
-		CryptoProvider* crypto,
-		IQRouter* router,
-		const FileTransferOptions& options) :
-			initiator(initiator),
-			responder(responder),
-			role(role),
-			s5bRegistry(s5bRegistry),
-			s5bServerManager(s5bServerManager),
-			s5bProxy(s5bProxy),
-			crypto(crypto),
-			router(router) {
-
-	localCandidateGenerator = new LocalJingleTransportCandidateGenerator(
-			s5bServerManager,
-			s5bProxy,
-			role == Initiator ? initiator : responder,
-			idGenerator,
-			options);
-	localCandidateGenerator->onLocalTransportCandidatesGenerated.connect(
-		boost::bind(&DefaultFileTransferTransporter::handleLocalCandidatesGenerated, this, _1));
-
-	remoteCandidateSelector = new RemoteJingleTransportCandidateSelector(
-			connectionFactory,
-			timerFactory,
-			options);
-	remoteCandidateSelector->onCandidateSelectFinished.connect(
-		boost::bind(&DefaultFileTransferTransporter::handleRemoteCandidateSelectFinished, this, _1, _2));
+        const JID& initiator,
+        const JID& responder,
+        Role role,
+        SOCKS5BytestreamRegistry* s5bRegistry,
+        SOCKS5BytestreamServerManager* s5bServerManager,
+        SOCKS5BytestreamProxiesManager* s5bProxy,
+        IDGenerator* idGenerator,
+        ConnectionFactory* connectionFactory,
+        TimerFactory* timerFactory,
+        CryptoProvider* crypto,
+        IQRouter* router,
+        const FileTransferOptions& options) :
+            initiator(initiator),
+            responder(responder),
+            role(role),
+            s5bRegistry(s5bRegistry),
+            s5bServerManager(s5bServerManager),
+            s5bProxy(s5bProxy),
+            crypto(crypto),
+            router(router) {
+
+    localCandidateGenerator = new LocalJingleTransportCandidateGenerator(
+            s5bServerManager,
+            s5bProxy,
+            role == Initiator ? initiator : responder,
+            idGenerator,
+            options);
+    localCandidateGenerator->onLocalTransportCandidatesGenerated.connect(
+        boost::bind(&DefaultFileTransferTransporter::handleLocalCandidatesGenerated, this, _1));
+
+    remoteCandidateSelector = new RemoteJingleTransportCandidateSelector(
+            connectionFactory,
+            timerFactory,
+            options);
+    remoteCandidateSelector->onCandidateSelectFinished.connect(
+        boost::bind(&DefaultFileTransferTransporter::handleRemoteCandidateSelectFinished, this, _1, _2));
 }
 
 DefaultFileTransferTransporter::~DefaultFileTransferTransporter() {
-	DefaultFileTransferTransporter::stopGeneratingLocalCandidates();
-	remoteCandidateSelector->onCandidateSelectFinished.disconnect(
-		boost::bind(&DefaultFileTransferTransporter::handleRemoteCandidateSelectFinished, this, _1, _2));
-	delete remoteCandidateSelector;
-
-	localCandidateGenerator->onLocalTransportCandidatesGenerated.disconnect(
-		boost::bind(&DefaultFileTransferTransporter::handleLocalCandidatesGenerated, this, _1));
-	delete localCandidateGenerator;
+    DefaultFileTransferTransporter::stopGeneratingLocalCandidates();
+    remoteCandidateSelector->onCandidateSelectFinished.disconnect(
+        boost::bind(&DefaultFileTransferTransporter::handleRemoteCandidateSelectFinished, this, _1, _2));
+    delete remoteCandidateSelector;
+
+    localCandidateGenerator->onLocalTransportCandidatesGenerated.disconnect(
+        boost::bind(&DefaultFileTransferTransporter::handleLocalCandidatesGenerated, this, _1));
+    delete localCandidateGenerator;
 }
 
 void DefaultFileTransferTransporter::initialize() {
-	s5bSessionID = s5bRegistry->generateSessionID();
+    s5bSessionID = s5bRegistry->generateSessionID();
 }
 
 void DefaultFileTransferTransporter::initialize(const std::string& s5bSessionID) {
-	this->s5bSessionID = s5bSessionID;
+    this->s5bSessionID = s5bSessionID;
 }
 
 void DefaultFileTransferTransporter::startGeneratingLocalCandidates() {
-	localCandidateGenerator->start();
+    localCandidateGenerator->start();
 }
 
 void DefaultFileTransferTransporter::stopGeneratingLocalCandidates() {
-	localCandidateGenerator->stop();
+    localCandidateGenerator->stop();
 }
-			
+
 void DefaultFileTransferTransporter::handleLocalCandidatesGenerated(
-		const std::vector<JingleS5BTransportPayload::Candidate>& candidates) {
-	s5bRegistry->setHasBytestream(getSOCKS5DstAddr(), true);
-	s5bProxy->connectToProxies(getSOCKS5DstAddr());
-	onLocalCandidatesGenerated(s5bSessionID, candidates, getSOCKS5DstAddr());
+        const std::vector<JingleS5BTransportPayload::Candidate>& candidates) {
+    s5bRegistry->setHasBytestream(getSOCKS5DstAddr(), true);
+    s5bProxy->connectToProxies(getSOCKS5DstAddr());
+    onLocalCandidatesGenerated(s5bSessionID, candidates, getSOCKS5DstAddr());
 }
 
 void DefaultFileTransferTransporter::handleRemoteCandidateSelectFinished(
-		const boost::optional<JingleS5BTransportPayload::Candidate>& candidate, 
-		boost::shared_ptr<SOCKS5BytestreamClientSession> session) {
-	remoteS5BClientSession = session;
-	onRemoteCandidateSelectFinished(s5bSessionID, candidate);
+        const boost::optional<JingleS5BTransportPayload::Candidate>& candidate,
+        boost::shared_ptr<SOCKS5BytestreamClientSession> session) {
+    remoteS5BClientSession = session;
+    onRemoteCandidateSelectFinished(s5bSessionID, candidate);
 }
 
 
 void DefaultFileTransferTransporter::addRemoteCandidates(
-		const std::vector<JingleS5BTransportPayload::Candidate>& candidates, const std::string& dstAddr) {
-	remoteCandidateSelector->setSOCKS5DstAddr(dstAddr.empty() ? getRemoteCandidateSOCKS5DstAddr() : dstAddr);
-	remoteCandidateSelector->addCandidates(candidates);
+        const std::vector<JingleS5BTransportPayload::Candidate>& candidates, const std::string& dstAddr) {
+    remoteCandidateSelector->setSOCKS5DstAddr(dstAddr.empty() ? getRemoteCandidateSOCKS5DstAddr() : dstAddr);
+    remoteCandidateSelector->addCandidates(candidates);
 }
 
 void DefaultFileTransferTransporter::startTryingRemoteCandidates() {
-	remoteCandidateSelector->startSelectingCandidate();
+    remoteCandidateSelector->startSelectingCandidate();
 }
 
 void DefaultFileTransferTransporter::stopTryingRemoteCandidates() {
-	remoteCandidateSelector->stopSelectingCandidate();
+    remoteCandidateSelector->stopSelectingCandidate();
 }
 
 void DefaultFileTransferTransporter::handleActivateProxySessionResult(const std::string& sessionID, ErrorPayload::ref error) {
-	onProxyActivated(sessionID, error);
+    onProxyActivated(sessionID, error);
 }
 
 void DefaultFileTransferTransporter::startActivatingProxy(const JID& proxyServiceJID) {
-	// activate proxy
-	SWIFT_LOG(debug) << "Start activating proxy " << proxyServiceJID.toString() << " with sid = " << s5bSessionID << "." << std::endl;
-	S5BProxyRequest::ref proxyRequest = boost::make_shared<S5BProxyRequest>();
-	proxyRequest->setSID(s5bSessionID);
-	proxyRequest->setActivate(role == Initiator ? responder : initiator);
-
-	boost::shared_ptr<GenericRequest<S5BProxyRequest> > request = boost::make_shared<GenericRequest<S5BProxyRequest> >(IQ::Set, proxyServiceJID, proxyRequest, router);
-	request->onResponse.connect(boost::bind(&DefaultFileTransferTransporter::handleActivateProxySessionResult, this, s5bSessionID, _2));
-	request->send();
+    // activate proxy
+    SWIFT_LOG(debug) << "Start activating proxy " << proxyServiceJID.toString() << " with sid = " << s5bSessionID << "." << std::endl;
+    S5BProxyRequest::ref proxyRequest = boost::make_shared<S5BProxyRequest>();
+    proxyRequest->setSID(s5bSessionID);
+    proxyRequest->setActivate(role == Initiator ? responder : initiator);
+
+    boost::shared_ptr<GenericRequest<S5BProxyRequest> > request = boost::make_shared<GenericRequest<S5BProxyRequest> >(IQ::Set, proxyServiceJID, proxyRequest, router);
+    request->onResponse.connect(boost::bind(&DefaultFileTransferTransporter::handleActivateProxySessionResult, this, s5bSessionID, _2));
+    request->send();
 }
 
 void DefaultFileTransferTransporter::stopActivatingProxy() {
-	// TODO
-	assert(false);
+    // TODO
+    assert(false);
 }
 
 boost::shared_ptr<TransportSession> DefaultFileTransferTransporter::createIBBSendSession(
-		const std::string& sessionID, unsigned int blockSize, boost::shared_ptr<ReadBytestream> stream) {
-	if (s5bServerManager->getServer()) {
-		closeLocalSession();
-	}
-	closeRemoteSession();
-	boost::shared_ptr<IBBSendSession> ibbSession = boost::make_shared<IBBSendSession>(
-			sessionID, initiator, responder, stream, router);
-	ibbSession->setBlockSize(blockSize);
-	return boost::make_shared<IBBSendTransportSession>(ibbSession);
+        const std::string& sessionID, unsigned int blockSize, boost::shared_ptr<ReadBytestream> stream) {
+    if (s5bServerManager->getServer()) {
+        closeLocalSession();
+    }
+    closeRemoteSession();
+    boost::shared_ptr<IBBSendSession> ibbSession = boost::make_shared<IBBSendSession>(
+            sessionID, initiator, responder, stream, router);
+    ibbSession->setBlockSize(blockSize);
+    return boost::make_shared<IBBSendTransportSession>(ibbSession);
 }
 
 boost::shared_ptr<TransportSession> DefaultFileTransferTransporter::createIBBReceiveSession(
-		const std::string& sessionID, unsigned long long size, boost::shared_ptr<WriteBytestream> stream) {
-	if (s5bServerManager->getServer()) {
-		closeLocalSession();
-	}
-	closeRemoteSession();
-	boost::shared_ptr<IBBReceiveSession> ibbSession = boost::make_shared<IBBReceiveSession>(
-			sessionID, initiator, responder, size, stream, router);
-	return boost::make_shared<IBBReceiveTransportSession>(ibbSession);
+        const std::string& sessionID, unsigned long long size, boost::shared_ptr<WriteBytestream> stream) {
+    if (s5bServerManager->getServer()) {
+        closeLocalSession();
+    }
+    closeRemoteSession();
+    boost::shared_ptr<IBBReceiveSession> ibbSession = boost::make_shared<IBBReceiveSession>(
+            sessionID, initiator, responder, size, stream, router);
+    return boost::make_shared<IBBReceiveTransportSession>(ibbSession);
 }
 
 boost::shared_ptr<TransportSession> DefaultFileTransferTransporter::createRemoteCandidateSession(
-		boost::shared_ptr<ReadBytestream> stream, const JingleS5BTransportPayload::Candidate& /* candidate */) {
-	closeLocalSession();
-	return boost::make_shared<S5BTransportSession<SOCKS5BytestreamClientSession> >(
-		remoteS5BClientSession, stream);
+        boost::shared_ptr<ReadBytestream> stream, const JingleS5BTransportPayload::Candidate& /* candidate */) {
+    closeLocalSession();
+    return boost::make_shared<S5BTransportSession<SOCKS5BytestreamClientSession> >(
+        remoteS5BClientSession, stream);
 }
 
 boost::shared_ptr<TransportSession> DefaultFileTransferTransporter::createRemoteCandidateSession(
-		boost::shared_ptr<WriteBytestream> stream, const JingleS5BTransportPayload::Candidate& /* candidate */) {
-	closeLocalSession();
-	return boost::make_shared<S5BTransportSession<SOCKS5BytestreamClientSession> >(
-		remoteS5BClientSession, stream);
+        boost::shared_ptr<WriteBytestream> stream, const JingleS5BTransportPayload::Candidate& /* candidate */) {
+    closeLocalSession();
+    return boost::make_shared<S5BTransportSession<SOCKS5BytestreamClientSession> >(
+        remoteS5BClientSession, stream);
 }
 
 boost::shared_ptr<SOCKS5BytestreamServerSession> DefaultFileTransferTransporter::getServerSession() {
-	s5bRegistry->setHasBytestream(getSOCKS5DstAddr(), false);
-	std::vector<boost::shared_ptr<SOCKS5BytestreamServerSession> > serverSessions = 
-		s5bServerManager->getServer()->getSessions(getSOCKS5DstAddr());
-	while (serverSessions.size() > 1) {
-		boost::shared_ptr<SOCKS5BytestreamServerSession> session = serverSessions.back();
-		serverSessions.pop_back();
-		session->stop();
-	}
-	return !serverSessions.empty() ? serverSessions.front() : boost::shared_ptr<SOCKS5BytestreamServerSession>();
+    s5bRegistry->setHasBytestream(getSOCKS5DstAddr(), false);
+    std::vector<boost::shared_ptr<SOCKS5BytestreamServerSession> > serverSessions =
+        s5bServerManager->getServer()->getSessions(getSOCKS5DstAddr());
+    while (serverSessions.size() > 1) {
+        boost::shared_ptr<SOCKS5BytestreamServerSession> session = serverSessions.back();
+        serverSessions.pop_back();
+        session->stop();
+    }
+    return !serverSessions.empty() ? serverSessions.front() : boost::shared_ptr<SOCKS5BytestreamServerSession>();
 }
 
 boost::shared_ptr<TransportSession> DefaultFileTransferTransporter::createLocalCandidateSession(
-		boost::shared_ptr<ReadBytestream> stream, const JingleS5BTransportPayload::Candidate& candidate) {
-	closeRemoteSession();
-	boost::shared_ptr<TransportSession> transportSession;
-	if (candidate.type == JingleS5BTransportPayload::Candidate::ProxyType) {
-		SOCKS5BytestreamClientSession::ref proxySession = s5bProxy->getProxySessionAndCloseOthers(candidate.jid, getLocalCandidateSOCKS5DstAddr());
-		assert(proxySession);
-		transportSession = boost::make_shared<S5BTransportSession<SOCKS5BytestreamClientSession> >(proxySession, stream);
-	}
-
-	if (!transportSession) {
-		boost::shared_ptr<SOCKS5BytestreamServerSession> serverSession = getServerSession();
-		if (serverSession) {
-			transportSession = boost::make_shared<S5BTransportSession<SOCKS5BytestreamServerSession> >(serverSession, stream);
-		}
-	}
-
-	if (!transportSession) {
-		transportSession = boost::make_shared<FailingTransportSession>();
-	}
-	return transportSession;
+        boost::shared_ptr<ReadBytestream> stream, const JingleS5BTransportPayload::Candidate& candidate) {
+    closeRemoteSession();
+    boost::shared_ptr<TransportSession> transportSession;
+    if (candidate.type == JingleS5BTransportPayload::Candidate::ProxyType) {
+        SOCKS5BytestreamClientSession::ref proxySession = s5bProxy->getProxySessionAndCloseOthers(candidate.jid, getLocalCandidateSOCKS5DstAddr());
+        assert(proxySession);
+        transportSession = boost::make_shared<S5BTransportSession<SOCKS5BytestreamClientSession> >(proxySession, stream);
+    }
+
+    if (!transportSession) {
+        boost::shared_ptr<SOCKS5BytestreamServerSession> serverSession = getServerSession();
+        if (serverSession) {
+            transportSession = boost::make_shared<S5BTransportSession<SOCKS5BytestreamServerSession> >(serverSession, stream);
+        }
+    }
+
+    if (!transportSession) {
+        transportSession = boost::make_shared<FailingTransportSession>();
+    }
+    return transportSession;
 }
 
 boost::shared_ptr<TransportSession> DefaultFileTransferTransporter::createLocalCandidateSession(
-		boost::shared_ptr<WriteBytestream> stream, const JingleS5BTransportPayload::Candidate& candidate) {
-	closeRemoteSession();
-	boost::shared_ptr<TransportSession> transportSession;
-	if (candidate.type == JingleS5BTransportPayload::Candidate::ProxyType) {
-		SOCKS5BytestreamClientSession::ref proxySession = s5bProxy->getProxySessionAndCloseOthers(candidate.jid, getLocalCandidateSOCKS5DstAddr());
-		assert(proxySession);
-		transportSession = boost::make_shared<S5BTransportSession<SOCKS5BytestreamClientSession> >(proxySession, stream);
-	}
-
-	if (!transportSession) {
-		boost::shared_ptr<SOCKS5BytestreamServerSession> serverSession = getServerSession();
-		if (serverSession) {
-			transportSession = boost::make_shared<S5BTransportSession<SOCKS5BytestreamServerSession> >(serverSession, stream);
-		}
-	}
-
-	if (!transportSession) {
-		transportSession = boost::make_shared<FailingTransportSession>();
-	}
-	return transportSession;
+        boost::shared_ptr<WriteBytestream> stream, const JingleS5BTransportPayload::Candidate& candidate) {
+    closeRemoteSession();
+    boost::shared_ptr<TransportSession> transportSession;
+    if (candidate.type == JingleS5BTransportPayload::Candidate::ProxyType) {
+        SOCKS5BytestreamClientSession::ref proxySession = s5bProxy->getProxySessionAndCloseOthers(candidate.jid, getLocalCandidateSOCKS5DstAddr());
+        assert(proxySession);
+        transportSession = boost::make_shared<S5BTransportSession<SOCKS5BytestreamClientSession> >(proxySession, stream);
+    }
+
+    if (!transportSession) {
+        boost::shared_ptr<SOCKS5BytestreamServerSession> serverSession = getServerSession();
+        if (serverSession) {
+            transportSession = boost::make_shared<S5BTransportSession<SOCKS5BytestreamServerSession> >(serverSession, stream);
+        }
+    }
+
+    if (!transportSession) {
+        transportSession = boost::make_shared<FailingTransportSession>();
+    }
+    return transportSession;
 }
 
 std::string DefaultFileTransferTransporter::getSOCKS5DstAddr() const {
-	std::string result;
-	if (role == Initiator) {
-		result = getInitiatorCandidateSOCKS5DstAddr();
-		SWIFT_LOG(debug) << "Initiator S5B DST.ADDR = " << s5bSessionID << " + " << initiator.toString() << " + " << responder.toString() << " : " << result << std::endl;
-	}
-	else {
-		result = getResponderCandidateSOCKS5DstAddr();
-		SWIFT_LOG(debug) << "Responder S5B DST.ADDR = " << s5bSessionID << " + " << responder.toString() << " + " << initiator.toString() << " : " << result << std::endl;
-	}
-	return result;
+    std::string result;
+    if (role == Initiator) {
+        result = getInitiatorCandidateSOCKS5DstAddr();
+        SWIFT_LOG(debug) << "Initiator S5B DST.ADDR = " << s5bSessionID << " + " << initiator.toString() << " + " << responder.toString() << " : " << result << std::endl;
+    }
+    else {
+        result = getResponderCandidateSOCKS5DstAddr();
+        SWIFT_LOG(debug) << "Responder S5B DST.ADDR = " << s5bSessionID << " + " << responder.toString() << " + " << initiator.toString() << " : " << result << std::endl;
+    }
+    return result;
 }
 
 std::string DefaultFileTransferTransporter::getInitiatorCandidateSOCKS5DstAddr() const {
-	return Hexify::hexify(crypto->getSHA1Hash(createSafeByteArray(s5bSessionID + initiator.toString() + responder.toString())));
+    return Hexify::hexify(crypto->getSHA1Hash(createSafeByteArray(s5bSessionID + initiator.toString() + responder.toString())));
 }
 
 std::string DefaultFileTransferTransporter::getResponderCandidateSOCKS5DstAddr() const {
-	return Hexify::hexify(crypto->getSHA1Hash(createSafeByteArray(s5bSessionID + responder.toString() + initiator.toString())));
+    return Hexify::hexify(crypto->getSHA1Hash(createSafeByteArray(s5bSessionID + responder.toString() + initiator.toString())));
 }
 
 std::string DefaultFileTransferTransporter::getRemoteCandidateSOCKS5DstAddr() const {
-	if (role == Initiator) {
-		return getResponderCandidateSOCKS5DstAddr();
-	}
-	else {
-		return getInitiatorCandidateSOCKS5DstAddr();
-	}
+    if (role == Initiator) {
+        return getResponderCandidateSOCKS5DstAddr();
+    }
+    else {
+        return getInitiatorCandidateSOCKS5DstAddr();
+    }
 }
 
 std::string DefaultFileTransferTransporter::getLocalCandidateSOCKS5DstAddr() const {
-	if (role == Responder) {
-		return getResponderCandidateSOCKS5DstAddr();
-	}
-	else {
-		return getInitiatorCandidateSOCKS5DstAddr();
-	}
+    if (role == Responder) {
+        return getResponderCandidateSOCKS5DstAddr();
+    }
+    else {
+        return getInitiatorCandidateSOCKS5DstAddr();
+    }
 }
 
 void DefaultFileTransferTransporter::closeLocalSession() {
-	s5bRegistry->setHasBytestream(getSOCKS5DstAddr(), false);
-	if (s5bServerManager->getServer()) {
-		std::vector<boost::shared_ptr<SOCKS5BytestreamServerSession> > serverSessions = s5bServerManager->getServer()->getSessions(getSOCKS5DstAddr());
-		foreach(boost::shared_ptr<SOCKS5BytestreamServerSession> session, serverSessions) {
-			session->stop();
-		}
-	}
+    s5bRegistry->setHasBytestream(getSOCKS5DstAddr(), false);
+    if (s5bServerManager->getServer()) {
+        std::vector<boost::shared_ptr<SOCKS5BytestreamServerSession> > serverSessions = s5bServerManager->getServer()->getSessions(getSOCKS5DstAddr());
+        foreach(boost::shared_ptr<SOCKS5BytestreamServerSession> session, serverSessions) {
+            session->stop();
+        }
+    }
 }
 
 void DefaultFileTransferTransporter::closeRemoteSession() {
-	if (remoteS5BClientSession) {
-		remoteS5BClientSession->stop();
-		remoteS5BClientSession.reset();
-	}
+    if (remoteS5BClientSession) {
+        remoteS5BClientSession->stop();
+        remoteS5BClientSession.reset();
+    }
 }