3 files changed, 103 insertions, 52 deletions
diff --git a/Swiften/Examples/SendFile/ReceiveFile.cpp b/Swiften/Examples/SendFile/ReceiveFile.cpp
index b46d790..f80f03a 100644
--- a/Swiften/Examples/SendFile/ReceiveFile.cpp
+++ b/Swiften/Examples/SendFile/ReceiveFile.cpp
@@ -7,14 +7,23 @@
 #include <boost/bind.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
+#include <iostream>
 
+#include <Swiften/Elements/Presence.h>
+#include <Swiften/Base/foreach.h>
 #include <Swiften/Client/Client.h>
+#include <Swiften/Elements/DiscoInfo.h>
 #include <Swiften/Network/BoostNetworkFactories.h>
 #include <Swiften/EventLoop/SimpleEventLoop.h>
 #include <Swiften/Client/ClientXMLTracer.h>
+#include <Swiften/Disco/ClientDiscoManager.h>
 #include <Swiften/FileTransfer/IncomingFileTransferManager.h>
 #include <Swiften/FileTransfer/FileWriteBytestream.h>
 #include <Swiften/Jingle/JingleSessionManager.h>
+#include <Swiften/FileTransfer/DefaultLocalJingleTransportCandidateGeneratorFactory.h>
+#include <Swiften/FileTransfer/DefaultRemoteJingleTransportCandidateSelectorFactory.h>
+#include <Swiften/FileTransfer/SOCKS5BytestreamRegistry.h>
+#include <Swiften/FileTransfer/FileTransferManager.h>
 
 using namespace Swift;
 
@@ -23,19 +32,20 @@ BoostNetworkFactories networkFactories(&eventLoop);
 
 int exitCode = 2;
 
+static const std::string CLIENT_NAME = "Swiften FT Test";
+static const std::string CLIENT_NODE = "http://swift.im";
+
 class FileReceiver {
 	public:
 		FileReceiver(const JID& jid, const std::string& password) : jid(jid), password(password), jingleSessionManager(NULL), incomingFileTransferManager(NULL) {
 			client = new Swift::Client(jid, password, &networkFactories);
 			client->onConnected.connect(boost::bind(&FileReceiver::handleConnected, this));
 			client->onDisconnected.connect(boost::bind(&FileReceiver::handleDisconnected, this, _1));
-			//tracer = new ClientXMLTracer(client);
+			tracer = new ClientXMLTracer(client);
 		}
 
 		~FileReceiver() {
-			delete incomingFileTransferManager;
-			delete jingleSessionManager;
-			//delete tracer;
+			delete tracer;
 			client->onDisconnected.disconnect(boost::bind(&FileReceiver::handleDisconnected, this, _1));
 			client->onConnected.disconnect(boost::bind(&FileReceiver::handleConnected, this));
 			delete client;
@@ -54,13 +64,24 @@ class FileReceiver {
 
 	private:
 		void handleConnected() {
-			client->sendPresence(Presence::create());
-			jingleSessionManager = new JingleSessionManager(client->getIQRouter());
-			incomingFileTransferManager = new IncomingFileTransferManager(jingleSessionManager, client->getIQRouter());
-			incomingFileTransferManager->onIncomingFileTransfer.connect(boost::bind(&FileReceiver::handleIncomingFileTransfer, this, _1));
+			Swift::logging = true;
+			client->getFileTransferManager()->startListeningOnPort(9999);
+			client->getFileTransferManager()->onIncomingFileTransfer.connect(boost::bind(&FileReceiver::handleIncomingFileTransfer, this, _1));
+			
+			DiscoInfo discoInfo;
+			discoInfo.addIdentity(DiscoInfo::Identity(CLIENT_NAME, "client", "pc"));
+			discoInfo.addFeature(DiscoInfo::JingleFeature);
+			discoInfo.addFeature(DiscoInfo::JingleFTFeature);
+			discoInfo.addFeature(DiscoInfo::Bytestream);
+			discoInfo.addFeature(DiscoInfo::JingleTransportsIBBFeature);
+			discoInfo.addFeature(DiscoInfo::JingleTransportsS5BFeature);
+			client->getDiscoManager()->setCapsNode(CLIENT_NODE);
+			client->getDiscoManager()->setDiscoInfo(discoInfo);
+			client->getPresenceSender()->sendPresence(Presence::create());
 		}
 
 		void handleIncomingFileTransfer(IncomingFileTransfer::ref transfer) {
+			SWIFT_LOG(debug) << "foo" << std::endl;
 			incomingFileTransfers.push_back(transfer);
 			transfer->accept(boost::make_shared<FileWriteBytestream>("out"));
 			//transfer->onFinished.connect(boost::bind(&FileReceiver::handleFileTransferFinished, this, _1));
@@ -97,6 +118,9 @@ class FileReceiver {
 		JingleSessionManager* jingleSessionManager;
 		IncomingFileTransferManager* incomingFileTransferManager;
 		std::vector<IncomingFileTransfer::ref> incomingFileTransfers;
+		DefaultLocalJingleTransportCandidateGeneratorFactory *localFactory;
+		DefaultRemoteJingleTransportCandidateSelectorFactory *remoteFactory;
+		SOCKS5BytestreamRegistry* bytestreamRegistry;
 };
 
 
diff --git a/Swiften/Examples/SendFile/SConscript b/Swiften/Examples/SendFile/SConscript
index 6986f22..d335513 100644
--- a/Swiften/Examples/SendFile/SConscript
+++ b/Swiften/Examples/SendFile/SConscript
@@ -2,14 +2,7 @@ Import("env")
 
 myenv = env.Clone()
 myenv.MergeFlags(myenv["SWIFTEN_FLAGS"])
-myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
-myenv.MergeFlags(myenv["BOOST_FLAGS"])
-myenv.MergeFlags(myenv["ZLIB_FLAGS"])
-myenv.MergeFlags(myenv["OPENSSL_FLAGS"])
-myenv.MergeFlags(myenv.get("SQLITE_FLAGS", {}))
-myenv.MergeFlags(myenv.get("LIBXML_FLAGS", ""))
-myenv.MergeFlags(myenv.get("EXPAT_FLAGS", ""))
-myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
+myenv.MergeFlags(myenv["SWIFTEN_DEP_FLAGS"])
 
 myenv.Program("SendFile", ["SendFile.cpp"])
 myenv.Program("ReceiveFile", ["ReceiveFile.cpp"])
diff --git a/Swiften/Examples/SendFile/SendFile.cpp b/Swiften/Examples/SendFile/SendFile.cpp
index 5ec00a9..9b2105b 100644
--- a/Swiften/Examples/SendFile/SendFile.cpp
+++ b/Swiften/Examples/SendFile/SendFile.cpp
@@ -4,20 +4,34 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/bind.hpp>
 #include <boost/filesystem.hpp>
-
-#include "Swiften/Client/Client.h"
-#include "Swiften/Network/BoostTimer.h"
-#include "Swiften/Network/TimerFactory.h"
-#include "Swiften/Network/BoostNetworkFactories.h"
-#include "Swiften/EventLoop/EventLoop.h"
-#include "Swiften/Client/ClientXMLTracer.h"
-#include "Swiften/EventLoop/SimpleEventLoop.h"
-#include "Swiften/FileTransfer/OutgoingFileTransfer.h"
-#include "Swiften/FileTransfer/FileReadBytestream.h"
-#include "Swiften/FileTransfer/SOCKS5BytestreamServer.h"
-#include "Swiften/Network/BoostConnectionServer.h"
+#include <iostream>
+
+#include <Swiften/Client/Client.h>
+#include <Swiften/Elements/Presence.h>
+#include <Swiften/Network/BoostTimer.h>
+#include <Swiften/Network/TimerFactory.h>
+#include <Swiften/Network/BoostNetworkFactories.h>
+#include <Swiften/EventLoop/EventLoop.h>
+#include <Swiften/Client/ClientXMLTracer.h>
+#include <Swiften/EventLoop/SimpleEventLoop.h>
+#include <Swiften/FileTransfer/OutgoingSIFileTransfer.h>
+#include <Swiften/FileTransfer/FileReadBytestream.h>
+#include <Swiften/FileTransfer/SOCKS5BytestreamServer.h>
+#include <Swiften/Network/BoostConnectionServer.h>
+#include <Swiften/FileTransfer/OutgoingFileTransferManager.h>
+#include <Swiften/FileTransfer/OutgoingFileTransfer.h>
+#include <Swiften/Jingle/JingleSessionManager.h>
+#include <Swiften/Disco/EntityCapsManager.h>
+#include <Swiften/FileTransfer/DefaultLocalJingleTransportCandidateGeneratorFactory.h>
+#include <Swiften/FileTransfer/DefaultRemoteJingleTransportCandidateSelectorFactory.h>
+#include <Swiften/Base/ByteArray.h>
+#include <Swiften/StringCodecs/MD5.h>
+#include <Swiften/StringCodecs/SHA1.h>
+#include <Swiften/StringCodecs/Hexify.h>
+#include <Swiften/FileTransfer/FileTransferManager.h>
 
 using namespace Swift;
 
@@ -28,45 +42,65 @@ int exitCode = 2;
 
 class FileSender {
 	public:
-		FileSender(const JID& jid, const std::string& password, const JID& recipient, const boost::filesystem::path& file, int port) : jid(jid), password(password), recipient(recipient), file(file), transfer(NULL) {
-			connectionServer = BoostConnectionServer::create(port, networkFactories.getIOServiceThread()->getIOService(), &eventLoop);
-			socksBytestreamServer = new SOCKS5BytestreamServer(connectionServer);
+	FileSender(const JID& jid, const std::string& password, const JID& recipient, const boost::filesystem::path& file) : jid(jid), password(password), recipient(recipient), file(file) {
 
 			client = new Swift::Client(jid, password, &networkFactories);
 			client->onConnected.connect(boost::bind(&FileSender::handleConnected, this));
 			client->onDisconnected.connect(boost::bind(&FileSender::handleDisconnected, this, _1));
-			//tracer = new ClientXMLTracer(client);
+			tracer = new ClientXMLTracer(client);
+			client->getEntityCapsProvider()->onCapsChanged.connect(boost::bind(&FileSender::handleCapsChanged, this, _1));
 		}
 
 		~FileSender() {
-			//delete tracer;
+			delete tracer;
 			client->onDisconnected.disconnect(boost::bind(&FileSender::handleDisconnected, this, _1));
 			client->onConnected.disconnect(boost::bind(&FileSender::handleConnected, this));
 			delete client;
-			delete socksBytestreamServer;
 		}
-
+		
 		void start() {
-			connectionServer->start();
-			socksBytestreamServer->start();
 			client->connect();
 		}
 
-		void stop() {
-			if (transfer) {
-				transfer->stop();
-			}
-			client->disconnect();
-			socksBytestreamServer->stop();
-			connectionServer->stop();
-		}
-
 	private:
 		void handleConnected() {
 			client->sendPresence(Presence::create());
-			transfer = new OutgoingFileTransfer("myid",	client->getJID(), recipient, file.filename(), boost::filesystem::file_size(file), "A file", boost::shared_ptr<FileReadBytestream>(new FileReadBytestream(file)), client->getIQRouter(), socksBytestreamServer);
+
+			client->getFileTransferManager()->startListeningOnPort(19999);
+			//ByteArray fileData;
+			//readByteArrayFromFile(fileData, file.string());
+			
+			// gather file information
+			/*StreamInitiationFileInfo fileInfo;
+			
+			fileInfo.setName(file.filename());
+			fileInfo.setSize(boost::filesystem::file_size(file));
+			fileInfo.setDescription("Some file!");
+			fileInfo.setDate(boost::posix_time::from_time_t(boost::filesystem::last_write_time(file)));*/
+			//fileInfo.setHash(Hexify::hexify(MD5::getHash(fileData)));
+			/*
+			transfer = new OutgoingSIFileTransfer("myid",	client->getJID(), recipient, file.filename(), boost::filesystem::file_size(file), "A file", boost::shared_ptr<FileReadBytestream>(new FileReadBytestream(file)), client->getIQRouter(), socksBytestreamServer);
 			transfer->onFinished.connect(boost::bind(&FileSender::handleFileTransferFinished, this, _1));
 			transfer->start();
+			 */
+		}
+
+		void handleCapsChanged(JID jid) {
+			if (jid.toBare() == recipient) {
+				// create ReadBytestream from file
+				boost::shared_ptr<FileReadBytestream> fileStream = boost::make_shared<FileReadBytestream>(file);
+
+				outgoingFileTransfer = client->getFileTransferManager()->createOutgoingFileTransfer(recipient, file, "Some File!", fileStream);
+
+				if (outgoingFileTransfer) {
+					std::cout << "started FT" << std::endl;
+					outgoingFileTransfer->start();
+					// TODO: getting notified about FT status and end
+				} else {
+					std::cout << "[ ERROR ] " << recipient << " doesn't support any kind of file transfer!" << std::endl;
+					//client->disconnect();
+				}
+			}
 		}
 
 		void handleDisconnected(const boost::optional<ClientError>&) {
@@ -83,23 +117,23 @@ class FileSender {
 				exit(0);
 			}
 		}
-
+		
 		void exit(int code) {
 			exitCode = code;
-			stop();
 			eventLoop.stop();
 		}
 	
 	private:
 		BoostConnectionServer::ref connectionServer;
 		SOCKS5BytestreamServer* socksBytestreamServer;
+		SOCKS5BytestreamRegistry* registry;
+		OutgoingFileTransfer::ref outgoingFileTransfer;
 		JID jid;
 		std::string password;
 		JID recipient;
 		boost::filesystem::path file;
 		Client* client;
 		ClientXMLTracer* tracer;
-		OutgoingFileTransfer* transfer;
 };
 
 
@@ -111,9 +145,9 @@ int main(int argc, char* argv[]) {
 
 	JID sender(argv[1]);
 	JID recipient(argv[3]);
-	FileSender fileSender(sender, std::string(argv[2]), recipient, boost::filesystem::path(argv[4]), 8888);
+	Swift::logging = true;
+	FileSender fileSender(sender, std::string(argv[2]), recipient, boost::filesystem::path(argv[4]));
 	fileSender.start();
-
 	{
 		/*BoostTimer::ref timer(BoostTimer::create(30000, &MainBoostIOServiceThread::getInstance().getIOService()));
 		timer->onTick.connect(boost::bind(&SimpleEventLoop::stop, &eventLoop));