1 files changed, 73 insertions, 39 deletions
diff --git a/Swiften/FileTransfer/IBBReceiveSession.cpp b/Swiften/FileTransfer/IBBReceiveSession.cpp
index f980c47..566dcca 100644
--- a/Swiften/FileTransfer/IBBReceiveSession.cpp
+++ b/Swiften/FileTransfer/IBBReceiveSession.cpp
@@ -4,32 +4,96 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "Swiften/FileTransfer/IBBReceiveSession.h"
+#include <Swiften/FileTransfer/IBBReceiveSession.h>
 
 #include <boost/bind.hpp>
-#include <iostream>
 
-#include "Swiften/Queries/IQRouter.h"
-#include "Swiften/FileTransfer/IBBRequest.h"
-#include "Swiften/FileTransfer/BytestreamException.h"
+#include <Swiften/Base/Log.h>
+#include <Swiften/Queries/IQRouter.h>
+#include <Swiften/FileTransfer/IBBRequest.h>
+#include <Swiften/FileTransfer/BytestreamException.h>
+#include <Swiften/Queries/SetResponder.h>
 
 namespace Swift {
 
-IBBReceiveSession::IBBReceiveSession(const std::string& id, const JID& from, size_t size, WriteBytestream::ref bytestream, IQRouter* router) : SetResponder<IBB>(router), id(id), from(from), size(size), bytestream(bytestream), router(router), sequenceNumber(0), active(false), receivedSize(0) {
+class IBBReceiveSession::IBBResponder : public SetResponder<IBB> {
+	public:
+		IBBResponder(IBBReceiveSession* session, IQRouter* router) : SetResponder<IBB>(router), session(session), sequenceNumber(0), receivedSize(0) {
+		}
+
+		virtual bool handleSetRequest(const JID& from, const JID&, const std::string& id, IBB::ref ibb) {
+			if (from == session->from && ibb->getStreamID() == session->id) {
+				if (ibb->getAction() == IBB::Data) {
+					if (sequenceNumber == ibb->getSequenceNumber()) {
+						session->onDataReceived(ibb->getData());
+						receivedSize += ibb->getData().size();
+						sequenceNumber++;
+						sendResponse(from, id, IBB::ref());
+						if (receivedSize >= session->size) {
+							if (receivedSize > session->size) {
+								std::cerr << "Warning: Received more data than expected" << std::endl;
+							}
+							session->finish(boost::optional<FileTransferError>());
+						}
+					}
+					else {
+						SWIFT_LOG(warning) << "Received data out of order" << std::endl;
+						sendError(from, id, ErrorPayload::NotAcceptable, ErrorPayload::Cancel);
+						session->finish(FileTransferError(FileTransferError::ClosedError));
+					}
+				}
+				else if (ibb->getAction() == IBB::Open) {
+					sendResponse(from, id, IBB::ref());
+				}
+				else if (ibb->getAction() == IBB::Close) {
+					sendResponse(from, id, IBB::ref());
+					session->finish(FileTransferError(FileTransferError::ClosedError));
+				}
+				return true;
+			}
+			return false;
+		}
+
+	private:
+		IBBReceiveSession* session;
+		int sequenceNumber;
+		size_t receivedSize;
+};
+
+
+IBBReceiveSession::IBBReceiveSession(
+		const std::string& id, 
+		const JID& from, 
+		size_t size, 
+		IQRouter* router) : 
+			id(id), 
+			from(from), 
+			size(size), 
+			router(router), 
+			active(false) {
+	responder = new IBBResponder(this, router);
 }
 
 IBBReceiveSession::~IBBReceiveSession() {
+	if (active) {
+		SWIFT_LOG(warning) << "Session still active" << std::endl;
+	}
+	delete responder;
 }
 
 void IBBReceiveSession::start() {
 	active = true;
+	responder->start();
 }
 
 void IBBReceiveSession::stop() {
-	if (active && router->isAvailable()) {
-		IBBRequest::create(from, IBB::createIBBClose(id), router)->send();
+	responder->stop();
+	if (active) {
+		if (router->isAvailable()) {
+			IBBRequest::create(from, IBB::createIBBClose(id), router)->send();
+		}
+		finish(boost::optional<FileTransferError>());
 	}
-	finish(boost::optional<FileTransferError>());
 }
 
 void IBBReceiveSession::finish(boost::optional<FileTransferError> error) {
@@ -37,34 +101,4 @@ void IBBReceiveSession::finish(boost::optional<FileTransferError> error) {
 	onFinished(error);
 }
 
-bool IBBReceiveSession::handleSetRequest(const JID& from, const JID&, const std::string& id, IBB::ref ibb) {
-	if (from == this->from && ibb->getStreamID() == id) {
-		if (ibb->getAction() == IBB::Data) {
-			if (sequenceNumber == ibb->getSequenceNumber()) {
-				bytestream->write(ibb->getData());
-				receivedSize += ibb->getData().getSize();
-				if (receivedSize >= size) {
-					if (receivedSize > size) {
-						std::cerr << "Warning: Received more data than expected" << std::endl;
-					}
-					finish(boost::optional<FileTransferError>());
-				}
-			}
-			else {
-				sendError(from, id, ErrorPayload::NotAcceptable, ErrorPayload::Cancel);
-				finish(FileTransferError(FileTransferError::ClosedError));
-			}
-		}
-		else if (ibb->getAction() == IBB::Open) {
-			sendResponse(from, id, IBB::ref());
-		}
-		else if (ibb->getAction() == IBB::Close) {
-			sendResponse(from, id, IBB::ref());
-			finish(FileTransferError(FileTransferError::ClosedError));
-		}
-		return true;
-	}
-	return false;
-}
-
 }