summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2015-10-01 12:46:59 (GMT)
committerSwift Review <review@swift.im>2015-10-14 09:26:15 (GMT)
commit23b2e7e80034d6513995801c39f818a1181e3249 (patch)
tree223091009bee6473fd7eca52c81282d99fa1c4a3 /Swiften
parent39f291afd3cab9d6c1e7cdf7f0f5476ef6747abd (diff)
downloadswift-23b2e7e80034d6513995801c39f818a1181e3249.zip
swift-23b2e7e80034d6513995801c39f818a1181e3249.tar.bz2
Remove remains of OutgoingSIFileTransfer
This existing code was commented out. There are not tests for it and no counterpart for incoming transfers. We support Jingle-based file-transfers as the main file-transfer method, as do lots of other clients. Test-Informations: Tested the complete project still builds. Change-Id: Icf278165733fe481b4e2bc777a73bc420cf76398
Diffstat (limited to 'Swiften')
-rw-r--r--Swiften/Examples/SendFile/SendFile.cpp30
-rw-r--r--Swiften/FileTransfer/OutgoingSIFileTransfer.cpp87
-rw-r--r--Swiften/FileTransfer/OutgoingSIFileTransfer.h54
-rw-r--r--Swiften/FileTransfer/SConscript1
4 files changed, 15 insertions, 157 deletions
diff --git a/Swiften/Examples/SendFile/SendFile.cpp b/Swiften/Examples/SendFile/SendFile.cpp
index d686387..5f2403a 100644
--- a/Swiften/Examples/SendFile/SendFile.cpp
+++ b/Swiften/Examples/SendFile/SendFile.cpp
@@ -1,34 +1,34 @@
/*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include <boost/date_time/posix_time/posix_time.hpp>
+#include <iostream>
+
#include <boost/bind.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/filesystem.hpp>
-#include <iostream>
+#include <Swiften/Base/ByteArray.h>
+#include <Swiften/Base/Log.h>
#include <Swiften/Client/Client.h>
+#include <Swiften/Client/ClientXMLTracer.h>
+#include <Swiften/Disco/EntityCapsManager.h>
#include <Swiften/Elements/Presence.h>
-#include <Swiften/Base/Log.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/FileTransferManager.h>
#include <Swiften/FileTransfer/OutgoingFileTransfer.h>
+#include <Swiften/FileTransfer/OutgoingFileTransferManager.h>
+#include <Swiften/FileTransfer/SOCKS5BytestreamServer.h>
#include <Swiften/Jingle/JingleSessionManager.h>
-#include <Swiften/Disco/EntityCapsManager.h>
-#include <Swiften/Base/ByteArray.h>
+#include <Swiften/Network/BoostConnectionServer.h>
+#include <Swiften/Network/BoostNetworkFactories.h>
+#include <Swiften/Network/BoostTimer.h>
+#include <Swiften/Network/TimerFactory.h>
#include <Swiften/StringCodecs/Hexify.h>
-#include <Swiften/FileTransfer/FileTransferManager.h>
using namespace Swift;
diff --git a/Swiften/FileTransfer/OutgoingSIFileTransfer.cpp b/Swiften/FileTransfer/OutgoingSIFileTransfer.cpp
deleted file mode 100644
index f100ed4..0000000
--- a/Swiften/FileTransfer/OutgoingSIFileTransfer.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2010-2013 Isode Limited.
- * All rights reserved.
- * See the COPYING file for more information.
- */
-
-#include <Swiften/FileTransfer/OutgoingSIFileTransfer.h>
-
-#include <boost/bind.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
-
-#include <Swiften/FileTransfer/StreamInitiationRequest.h>
-#include <Swiften/FileTransfer/BytestreamsRequest.h>
-#include <Swiften/FileTransfer/SOCKS5BytestreamServer.h>
-#include <Swiften/FileTransfer/IBBSendSession.h>
-
-namespace Swift {
-
-OutgoingSIFileTransfer::OutgoingSIFileTransfer(const std::string& id, const JID& from, const JID& to, const std::string& name, unsigned long long size, const std::string& description, boost::shared_ptr<ReadBytestream> bytestream, IQRouter* iqRouter, SOCKS5BytestreamServer* socksServer) : id(id), from(from), to(to), name(name), size(size), description(description), bytestream(bytestream), iqRouter(iqRouter), socksServer(socksServer) {
-}
-
-void OutgoingSIFileTransfer::start() {
- /*
- StreamInitiation::ref streamInitiation(new StreamInitiation());
- streamInitiation->setID(id);
- streamInitiation->setFileInfo(StreamInitiationFileInfo(name, description, size));
- //streamInitiation->addProvidedMethod("http://jabber.org/protocol/bytestreams");
- streamInitiation->addProvidedMethod("http://jabber.org/protocol/ibb");
- StreamInitiationRequest::ref request = StreamInitiationRequest::create(to, streamInitiation, iqRouter);
- request->onResponse.connect(boost::bind(&OutgoingSIFileTransfer::handleStreamInitiationRequestResponse, this, _1, _2));
- request->send();
- */
-}
-
-void OutgoingSIFileTransfer::stop() {
-}
-
-void OutgoingSIFileTransfer::handleStreamInitiationRequestResponse(StreamInitiation::ref, ErrorPayload::ref) {
- /*
- if (error) {
- finish(FileTransferError());
- }
- else {
- if (response->getRequestedMethod() == "http://jabber.org/protocol/bytestreams") {
- socksServer->addReadBytestream(id, from, to, bytestream);
- Bytestreams::ref bytestreams(new Bytestreams());
- bytestreams->setStreamID(id);
- HostAddressPort addressPort = socksServer->getAddressPort();
- bytestreams->addStreamHost(Bytestreams::StreamHost(addressPort.getAddress().toString(), from, addressPort.getPort()));
- BytestreamsRequest::ref request = BytestreamsRequest::create(to, bytestreams, iqRouter);
- request->onResponse.connect(boost::bind(&OutgoingSIFileTransfer::handleBytestreamsRequestResponse, this, _1, _2));
- request->send();
- }
- else if (response->getRequestedMethod() == "http://jabber.org/protocol/ibb") {
- ibbSession = boost::make_shared<IBBSendSession>(id, from, to, bytestream, iqRouter);
- ibbSession->onFinished.connect(boost::bind(&OutgoingSIFileTransfer::handleIBBSessionFinished, this, _1));
- ibbSession->start();
- }
- }
- */
-}
-
-void OutgoingSIFileTransfer::handleBytestreamsRequestResponse(Bytestreams::ref, ErrorPayload::ref) {
- /*
- if (error) {
- finish(FileTransferError());
- }
- */
- //socksServer->onTransferFinished.connect();
-}
-
-void OutgoingSIFileTransfer::finish(boost::optional<FileTransferError>) {
- /*
- if (ibbSession) {
- ibbSession->onFinished.disconnect(boost::bind(&OutgoingSIFileTransfer::handleIBBSessionFinished, this, _1));
- ibbSession.reset();
- }
- socksServer->removeReadBytestream(id, from, to);
- onFinished(error);
- */
-}
-
-void OutgoingSIFileTransfer::handleIBBSessionFinished(boost::optional<FileTransferError>) {
- //finish(error);
-}
-
-}
diff --git a/Swiften/FileTransfer/OutgoingSIFileTransfer.h b/Swiften/FileTransfer/OutgoingSIFileTransfer.h
deleted file mode 100644
index c323a77..0000000
--- a/Swiften/FileTransfer/OutgoingSIFileTransfer.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2010-2015 Isode Limited.
- * All rights reserved.
- * See the COPYING file for more information.
- */
-
-#pragma once
-
-#include <boost/shared_ptr.hpp>
-
-#include <Swiften/Base/API.h>
-#include <Swiften/FileTransfer/OutgoingFileTransfer.h>
-#include <Swiften/FileTransfer/ReadBytestream.h>
-#include <Swiften/Base/boost_bsignals.h>
-#include <Swiften/FileTransfer/FileTransferError.h>
-#include <Swiften/FileTransfer/SOCKS5BytestreamServer.h>
-#include <Swiften/JID/JID.h>
-#include <Swiften/Elements/StreamInitiation.h>
-#include <Swiften/Elements/Bytestreams.h>
-#include <Swiften/Elements/ErrorPayload.h>
-#include <Swiften/FileTransfer/IBBSendSession.h>
-
-namespace Swift {
- class IQRouter;
- class SOCKS5BytestreamServer;
-
- class SWIFTEN_API OutgoingSIFileTransfer : public OutgoingFileTransfer {
- public:
- OutgoingSIFileTransfer(const std::string& id, const JID& from, const JID& to, const std::string& name, unsigned long long size, const std::string& description, boost::shared_ptr<ReadBytestream> bytestream, IQRouter* iqRouter, SOCKS5BytestreamServer* socksServer);
-
- virtual void start();
- virtual void stop();
-
- boost::signal<void (const boost::optional<FileTransferError>&)> onFinished;
-
- private:
- void handleStreamInitiationRequestResponse(StreamInitiation::ref, ErrorPayload::ref);
- void handleBytestreamsRequestResponse(Bytestreams::ref, ErrorPayload::ref);
- void finish(boost::optional<FileTransferError> error);
- void handleIBBSessionFinished(boost::optional<FileTransferError> error);
-
- private:
- std::string id;
- JID from;
- JID to;
- std::string name;
- unsigned long long size;
- std::string description;
- boost::shared_ptr<ReadBytestream> bytestream;
- IQRouter* iqRouter;
- SOCKS5BytestreamServer* socksServer;
- boost::shared_ptr<IBBSendSession> ibbSession;
- };
-}
diff --git a/Swiften/FileTransfer/SConscript b/Swiften/FileTransfer/SConscript
index ff162ad..41af8d4 100644
--- a/Swiften/FileTransfer/SConscript
+++ b/Swiften/FileTransfer/SConscript
@@ -3,7 +3,6 @@ Import("swiften_env", "env")
sources = [
"ByteArrayReadBytestream.cpp",
"OutgoingFileTransfer.cpp",
- "OutgoingSIFileTransfer.cpp",
"OutgoingJingleFileTransfer.cpp",
"OutgoingFileTransferManager.cpp",
"IncomingFileTransfer.cpp",