7 files changed, 27 insertions, 23 deletions
diff --git a/Swiften/FileTransfer/ConnectivityManager.cpp b/Swiften/FileTransfer/ConnectivityManager.cpp
index 174d6ab..cfb0729 100644
--- a/Swiften/FileTransfer/ConnectivityManager.cpp
+++ b/Swiften/FileTransfer/ConnectivityManager.cpp
@@ -1,57 +1,59 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 #include "ConnectivityManager.h"
 
+#include <boost/bind.hpp>
+
 #include <Swiften/Base/foreach.h>
 #include <Swiften/Base/Log.h>
 #include <Swiften/Network/NetworkInterface.h>
-#include <Swiften/Network/PlatformNATTraversalGetPublicIPRequest.h>
-#include <Swiften/Network/PlatformNATTraversalRemovePortForwardingRequest.h>
-#include <Swiften/Network/PlatformNATTraversalWorker.h>
+#include <Swiften/Network/NATTraversalGetPublicIPRequest.h>
+#include <Swiften/Network/NATTraversalRemovePortForwardingRequest.h>
+#include <Swiften/Network/NATTraverser.h>
 #include <Swiften/Network/PlatformNetworkEnvironment.h>
 
 namespace Swift {
 
-ConnectivityManager::ConnectivityManager(PlatformNATTraversalWorker* worker) : natTraversalWorker(worker) {
+ConnectivityManager::ConnectivityManager(NATTraverser* worker) : natTraversalWorker(worker) {
 
 }
 
 ConnectivityManager::~ConnectivityManager() {
 	std::set<int> leftOpenPorts = ports;
 	foreach(int port, leftOpenPorts) {
 		removeListeningPort(port);
 	}
 }
 
 void ConnectivityManager::addListeningPort(int port) {
 	ports.insert(port);
-	boost::shared_ptr<PlatformNATTraversalGetPublicIPRequest> getIPRequest = natTraversalWorker->createGetPublicIPRequest();
+	boost::shared_ptr<NATTraversalGetPublicIPRequest> getIPRequest = natTraversalWorker->createGetPublicIPRequest();
 	if (getIPRequest) {
 		getIPRequest->onResult.connect(boost::bind(&ConnectivityManager::natTraversalGetPublicIPResult, this, _1));
 		getIPRequest->run();
 	}
 
-	boost::shared_ptr<PlatformNATTraversalForwardPortRequest> forwardPortRequest = natTraversalWorker->createForwardPortRequest(port, port);
+	boost::shared_ptr<NATTraversalForwardPortRequest> forwardPortRequest = natTraversalWorker->createForwardPortRequest(port, port);
 	if (forwardPortRequest) {
 		forwardPortRequest->onResult.connect(boost::bind(&ConnectivityManager::natTraversalForwardPortResult, this, _1));
 		forwardPortRequest->run();
 	}
 }
 
 void ConnectivityManager::removeListeningPort(int port) {
 	SWIFT_LOG(debug) << "remove listening port " << port << std::endl;
 	ports.erase(port);
-	boost::shared_ptr<PlatformNATTraversalRemovePortForwardingRequest> removePortForwardingRequest = natTraversalWorker->createRemovePortForwardingRequest(port, port);
+	boost::shared_ptr<NATTraversalRemovePortForwardingRequest> removePortForwardingRequest = natTraversalWorker->createRemovePortForwardingRequest(port, port);
 	if (removePortForwardingRequest) {
 		removePortForwardingRequest->run();
 	}
 }
 
 std::vector<HostAddressPort> ConnectivityManager::getHostAddressPorts() const {
 	PlatformNetworkEnvironment env;
 	std::vector<HostAddressPort> results;
 
@@ -83,19 +85,19 @@ std::vector<HostAddressPort> ConnectivityManager::getAssistedHostAddressPorts()
 void ConnectivityManager::natTraversalGetPublicIPResult(boost::optional<HostAddress> address) {
 	if (address) {
 		publicAddress = address;
 		SWIFT_LOG(debug) << "Public IP discovered as " << publicAddress.get().toString() << "." << std::endl;
 	} else {
 		SWIFT_LOG(debug) << "No public IP discoverable." << std::endl;
 	}
 }
 
-void ConnectivityManager::natTraversalForwardPortResult(boost::optional<PlatformNATTraversalForwardPortRequest::PortMapping> mapping) {
+void ConnectivityManager::natTraversalForwardPortResult(boost::optional<NATTraversalForwardPortRequest::PortMapping> mapping) {
 	if (mapping) {
 		SWIFT_LOG(debug) << "Mapping port was successful." << std::endl;
 	} else {
 		SWIFT_LOG(debug) << "Mapping port has failed." << std::endl;
 	}
 }
 
 
 }
diff --git a/Swiften/FileTransfer/ConnectivityManager.h b/Swiften/FileTransfer/ConnectivityManager.h
index 87041b2..41e0ab6 100644
--- a/Swiften/FileTransfer/ConnectivityManager.h
+++ b/Swiften/FileTransfer/ConnectivityManager.h
@@ -6,38 +6,39 @@
 
 #pragma once
 
 #include <vector>
 #include <set>
 
 #include <boost/optional.hpp>
 
 #include <Swiften/Network/HostAddressPort.h>
-#include <Swiften/Network/PlatformNATTraversalForwardPortRequest.h>
+#include <Swiften/Network/NATTraverser.h>
+#include <Swiften/Network/NATTraversalForwardPortRequest.h>
 
 namespace Swift {
 
-class PlatformNATTraversalWorker;
+class NATTraverser;
 
 class ConnectivityManager {
 public:
-	ConnectivityManager(PlatformNATTraversalWorker*);
+	ConnectivityManager(NATTraverser*);
 	~ConnectivityManager();
 public:
 	void addListeningPort(int port);
 	void removeListeningPort(int port);
 
 	std::vector<HostAddressPort> getHostAddressPorts() const;
 	std::vector<HostAddressPort> getAssistedHostAddressPorts() const;
 
 private:
 	void natTraversalGetPublicIPResult(boost::optional<HostAddress> address);
-	void natTraversalForwardPortResult(boost::optional<PlatformNATTraversalForwardPortRequest::PortMapping> mapping);
+	void natTraversalForwardPortResult(boost::optional<NATTraversalForwardPortRequest::PortMapping> mapping);
 
 private:
-	PlatformNATTraversalWorker* natTraversalWorker;
+	NATTraverser* natTraversalWorker;
 
 	std::set<int> ports;
 	boost::optional<HostAddress> publicAddress;
 };
 
 }
diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.cpp b/Swiften/FileTransfer/FileTransferManagerImpl.cpp
index f89a3e9..a30aeed 100644
--- a/Swiften/FileTransfer/FileTransferManagerImpl.cpp
+++ b/Swiften/FileTransfer/FileTransferManagerImpl.cpp
@@ -19,26 +19,26 @@
 #include <Swiften/FileTransfer/DefaultRemoteJingleTransportCandidateSelectorFactory.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamRegistry.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamServer.h>
 #include <Swiften/FileTransfer/SOCKS5BytestreamProxy.h>
 #include <Swiften/Presence/PresenceOracle.h>
 #include <Swiften/Elements/Presence.h>
 #include <Swiften/Network/ConnectionFactory.h>
 #include <Swiften/Network/ConnectionServerFactory.h>
 #include <Swiften/Network/HostAddress.h>
-#include <Swiften/Network/PlatformNATTraversalWorker.h>
+#include <Swiften/Network/NATTraverser.h>
 
 namespace Swift {
 
-FileTransferManagerImpl::FileTransferManagerImpl(const JID& ownFullJID, JingleSessionManager* jingleSessionManager, IQRouter* router, EntityCapsProvider* capsProvider, PresenceOracle* presOracle, ConnectionFactory* connectionFactory, ConnectionServerFactory* connectionServerFactory, TimerFactory* timerFactory, PlatformNATTraversalWorker* natTraversalWorker) : ownJID(ownFullJID), jingleSM(jingleSessionManager), iqRouter(router), capsProvider(capsProvider), presenceOracle(presOracle), timerFactory(timerFactory), connectionFactory(connectionFactory), connectionServerFactory(connectionServerFactory), natTraversalWorker(natTraversalWorker), bytestreamServer(NULL) {
+FileTransferManagerImpl::FileTransferManagerImpl(const JID& ownFullJID, JingleSessionManager* jingleSessionManager, IQRouter* router, EntityCapsProvider* capsProvider, PresenceOracle* presOracle, ConnectionFactory* connectionFactory, ConnectionServerFactory* connectionServerFactory, TimerFactory* timerFactory, NATTraverser* natTraverser) : ownJID(ownFullJID), jingleSM(jingleSessionManager), iqRouter(router), capsProvider(capsProvider), presenceOracle(presOracle), timerFactory(timerFactory), connectionFactory(connectionFactory), connectionServerFactory(connectionServerFactory), natTraverser(natTraverser), bytestreamServer(NULL) {
 	assert(!ownFullJID.isBare());
 
-	connectivityManager = new ConnectivityManager(natTraversalWorker);
+	connectivityManager = new ConnectivityManager(natTraverser);
 	bytestreamRegistry = new SOCKS5BytestreamRegistry();
 	bytestreamProxy = new SOCKS5BytestreamProxy(connectionFactory, timerFactory);
 
 	localCandidateGeneratorFactory = new DefaultLocalJingleTransportCandidateGeneratorFactory(connectivityManager, bytestreamRegistry, bytestreamProxy, ownFullJID);
 	remoteCandidateSelectorFactory = new DefaultRemoteJingleTransportCandidateSelectorFactory(connectionFactory, timerFactory);
 	outgoingFTManager = new OutgoingFileTransferManager(ownJID, jingleSM, iqRouter, capsProvider, remoteCandidateSelectorFactory, localCandidateGeneratorFactory, bytestreamRegistry, bytestreamProxy);
 	incomingFTManager = new IncomingFileTransferManager(ownJID, jingleSM, iqRouter, remoteCandidateSelectorFactory, localCandidateGeneratorFactory, bytestreamRegistry, bytestreamProxy, timerFactory);
 	incomingFTManager->onIncomingFileTransfer.connect(onIncomingFileTransfer);
 }
diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.h b/Swiften/FileTransfer/FileTransferManagerImpl.h
index b38eaea..d1c3786 100644
--- a/Swiften/FileTransfer/FileTransferManagerImpl.h
+++ b/Swiften/FileTransfer/FileTransferManagerImpl.h
@@ -26,30 +26,30 @@ class Client;
 class ConnectionFactory;
 class ConnectionServerFactory;
 class ConnectivityManager;
 class EntityCapsProvider;
 class IQRouter;
 class IncomingFileTransferManager;
 class JingleSessionManager;
 class LocalJingleTransportCandidateGeneratorFactory;
 class OutgoingFileTransferManager;
-class PlatformNATTraversalWorker;
+class NATTraverser;
 class PresenceOracle;
 class ReadBytestream;
 class RemoteJingleTransportCandidateSelectorFactory;
 class SOCKS5BytestreamRegistry;
 class SOCKS5BytestreamServer;
 class SOCKS5BytestreamProxy;
 class TimerFactory;
 
 class FileTransferManagerImpl : public FileTransferManager {
 public:
-	FileTransferManagerImpl(const JID& ownFullJID, JingleSessionManager* jingleSessionManager, IQRouter* router, EntityCapsProvider* capsProvider, PresenceOracle* presOracle, ConnectionFactory* connectionFactory, ConnectionServerFactory* connectionServerFactory, TimerFactory* timerFactory, PlatformNATTraversalWorker* natTraversalWorker);
+	FileTransferManagerImpl(const JID& ownFullJID, JingleSessionManager* jingleSessionManager, IQRouter* router, EntityCapsProvider* capsProvider, PresenceOracle* presOracle, ConnectionFactory* connectionFactory, ConnectionServerFactory* connectionServerFactory, TimerFactory* timerFactory, NATTraverser* natTraverser);
 	~FileTransferManagerImpl();
 	
 	void startListeningOnPort(int port);
 	void addS5BProxy(S5BProxyRequest::ref proxy);
 
 	OutgoingFileTransfer::ref createOutgoingFileTransfer(const JID& to, const boost::filesystem::path& filepath, const std::string& description, boost::shared_ptr<ReadBytestream> bytestream);
 	OutgoingFileTransfer::ref createOutgoingFileTransfer(const JID& to, const std::string& filename, const std::string& description, const boost::uintmax_t sizeInBytes, const boost::posix_time::ptime& lastModified, boost::shared_ptr<ReadBytestream> bytestream);
 	
  private:
@@ -64,17 +64,17 @@ private:
 	LocalJingleTransportCandidateGeneratorFactory* localCandidateGeneratorFactory;
 	JingleSessionManager* jingleSM;
 	IQRouter* iqRouter;
 	EntityCapsProvider* capsProvider;
 	PresenceOracle* presenceOracle;
 
 	TimerFactory* timerFactory;
 	ConnectionFactory* connectionFactory;
 	ConnectionServerFactory* connectionServerFactory;
-	PlatformNATTraversalWorker* natTraversalWorker;
+	NATTraverser* natTraverser;
 	SOCKS5BytestreamRegistry* bytestreamRegistry;
 	SOCKS5BytestreamServer* bytestreamServer;
 	SOCKS5BytestreamProxy* bytestreamProxy;
 	ConnectivityManager* connectivityManager;
 };
 
 }
diff --git a/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp b/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp
index 7407f44..4c6ae72 100644
--- a/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp
+++ b/Swiften/FileTransfer/UnitTest/IncomingJingleFileTransferTest.cpp
@@ -150,38 +150,38 @@ public:
 			delete iqRouter;
 			delete stanzaChannel;
 			delete eventLoop;
 		}
 
 		// Tests whether IncomingJingleFileTransfer would accept a IBB only file transfer.
 		void test_AcceptOnyIBBSendsSessionAccept() {
 			//1. create your test incoming file transfer
 			shared_ptr<JingleFileTransferDescription> desc = make_shared<JingleFileTransferDescription>();
-			desc->addOffer(StreamInitiationFileInfo());
+			desc->addOffer(StreamInitiationFileInfo("foo.txt", "", 10));
 			jingleContentPayload->addDescription(desc);
 			JingleIBBTransportPayload::ref tpRef = make_shared<JingleIBBTransportPayload>();
 			tpRef->setSessionID("mysession");
 			jingleContentPayload->addTransport(tpRef);
 
 			shared_ptr<IncomingJingleFileTransfer> fileTransfer = createTestling();
 
 			//2. do 'accept' on a dummy writebytestream (you'll have to look if there already is one)
 			shared_ptr<ByteArrayWriteBytestream> byteStream = make_shared<ByteArrayWriteBytestream>();
 			fileTransfer->accept(byteStream);
 
 			// check whether accept has been called
 			getCall<FakeJingleSession::AcceptCall>(0);
 		}
 
 		void test_OnlyIBBTransferReceiveWorks() {
 			//1. create your test incoming file transfer
 			shared_ptr<JingleFileTransferDescription> desc = make_shared<JingleFileTransferDescription>();
-			desc->addOffer(StreamInitiationFileInfo());
+			desc->addOffer(StreamInitiationFileInfo("file.txt", "", 10));
 			jingleContentPayload->addDescription(desc);
 			JingleIBBTransportPayload::ref tpRef = make_shared<JingleIBBTransportPayload>();
 			tpRef->setSessionID("mysession");
 			jingleContentPayload->addTransport(tpRef);
 
 			shared_ptr<IncomingJingleFileTransfer> fileTransfer = createTestling();
 
 			//2. do 'accept' on a dummy writebytestream (you'll have to look if there already is one)
 			shared_ptr<ByteArrayWriteBytestream> byteStream = make_shared<ByteArrayWriteBytestream>();
@@ -229,19 +229,19 @@ public:
 
 		void test_S5BTransferReceiveTest() {
 			addFileTransferDescription();
 			JingleS5BTransportPayload::ref payLoad = addJingleS5BPayload();
 		}
 
 private:
 	void addFileTransferDescription() {
 		shared_ptr<JingleFileTransferDescription> desc = make_shared<JingleFileTransferDescription>();
-		desc->addOffer(StreamInitiationFileInfo());
+		desc->addOffer(StreamInitiationFileInfo("file.txt", "", 10));
 		jingleContentPayload->addDescription(desc);
 	}
 
 	shared_ptr<JingleS5BTransportPayload> addJingleS5BPayload() {
 		JingleS5BTransportPayload::ref payLoad = make_shared<JingleS5BTransportPayload>();
 		payLoad->setSessionID("mysession");
 		jingleContentPayload->addTransport(payLoad);
 		return payLoad;
 	}
diff --git a/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamClientSessionTest.cpp b/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamClientSessionTest.cpp
index 35580bf..75b9faf 100644
--- a/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamClientSessionTest.cpp
+++ b/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamClientSessionTest.cpp
@@ -183,19 +183,19 @@ public:
 		eventLoop->processEvents();
 
 		helper.unprocessedInput.clear();
 		serverRespondRequestOK();
 		eventLoop->processEvents();
 		CPPUNIT_ASSERT_EQUAL(true, helper.sessionReadyCalled);
 		CPPUNIT_ASSERT_EQUAL(false, helper.sessionReadyError);
 
 		helper.unprocessedInput.clear();
-		ByteArray transferData = generateRandomByteArray(1024 * 1024);
+		ByteArray transferData = generateRandomByteArray(1024);
 		boost::shared_ptr<ByteArrayReadBytestream> input = boost::make_shared<ByteArrayReadBytestream>(transferData);
 		clientSession->startSending(input);
 		eventLoop->processEvents();
 
 		CPPUNIT_ASSERT_EQUAL(createByteArray(transferData.data(), transferData.size()), helper.unprocessedInput);
 	}
 
 
 
diff --git a/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamServerSessionTest.cpp b/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamServerSessionTest.cpp
index cd480f0..4fe72c0 100644
--- a/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamServerSessionTest.cpp
+++ b/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamServerSessionTest.cpp
@@ -90,18 +90,19 @@ class SOCKS5BytestreamServerSessionTest : public CppUnit::TestFixture {
 		void testReceiveData() {
 			boost::shared_ptr<SOCKS5BytestreamServerSession> testling(createSession());
 			StartStopper<SOCKS5BytestreamServerSession> stopper(testling.get());
 			bytestreams->addReadBytestream("abcdef", stream1);
 			authenticate();
 			request("abcdef");
 			eventLoop->processEvents();
 			testling->startTransfer();
 			skipHeader("abcdef");
+			eventLoop->processEvents();
 
 			CPPUNIT_ASSERT(createByteArray("abcdefg") == receivedData);
 			CPPUNIT_ASSERT_EQUAL(2, receivedDataChunks);
 		}
 
 		void testReceiveData_Chunked() {
 			boost::shared_ptr<SOCKS5BytestreamServerSession> testling(createSession());
 			testling->setChunkSize(3);
 			StartStopper<SOCKS5BytestreamServerSession> stopper(testling.get());