1 files changed, 4 insertions, 5 deletions
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamServerSession.h b/Swiften/FileTransfer/SOCKS5BytestreamServerSession.h
index d8eea34..ed5272f 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamServerSession.h
+++ b/Swiften/FileTransfer/SOCKS5BytestreamServerSession.h
@@ -1,84 +1,83 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 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/Base/boost_bsignals.h>
-#include <Swiften/Network/Connection.h>
+#include <Swiften/FileTransfer/FileTransferError.h>
 #include <Swiften/FileTransfer/ReadBytestream.h>
 #include <Swiften/FileTransfer/WriteBytestream.h>
-#include <Swiften/FileTransfer/FileTransferError.h>
+#include <Swiften/Network/Connection.h>
 
 namespace Swift {
 	class SOCKS5BytestreamRegistry;
 
 	class SWIFTEN_API SOCKS5BytestreamServerSession {
 		public:
 		typedef boost::shared_ptr<SOCKS5BytestreamServerSession> ref;
 
 		public:
 			enum State {
 				Initial,
 				WaitingForAuthentication,
 				WaitingForRequest,
 				ReadyForTransfer,
 				ReadingData,
 				WritingData,
 				Finished
 			};
 
 			SOCKS5BytestreamServerSession(boost::shared_ptr<Connection> connection, SOCKS5BytestreamRegistry* registry);
 			~SOCKS5BytestreamServerSession();
 
 			void setChunkSize(int chunkSize) {
 				this->chunkSize = chunkSize;
 			}
 
 			void start();
 			void stop();
 
 			void startSending(boost::shared_ptr<ReadBytestream>);
 			void startReceiving(boost::shared_ptr<WriteBytestream>);
 
 			HostAddressPort getAddressPort() const;
 
 			boost::signal<void (boost::optional<FileTransferError>)> onFinished;
 			boost::signal<void (unsigned long long)> onBytesSent;
-			// boost::signal<void (unsigned long long)> onBytesReceived;
 
 			const std::string& getStreamID() const {
 				return streamID;
 			}
 
 		private:
-			void finish(bool error);
+			void finish(const boost::optional<FileTransferError>& error = boost::optional<FileTransferError>());
 			void process();
 			void handleDataRead(boost::shared_ptr<SafeByteArray>);
 			void handleDisconnected(const boost::optional<Connection::Error>&);
 			void handleDataAvailable();
 			void sendData();
 
 		private:
 			boost::shared_ptr<Connection> connection;
 			SOCKS5BytestreamRegistry* bytestreams;
 			ByteArray unprocessedData;
 			State state;
 			int chunkSize;
 			std::string streamID;
 			boost::shared_ptr<ReadBytestream> readBytestream;
 			boost::shared_ptr<WriteBytestream> writeBytestream;
 			bool waitingForData;
 
 			boost::bsignals::connection disconnectedConnection;
 			boost::bsignals::connection dataReadConnection;
 			boost::bsignals::connection dataWrittenConnection;
 			boost::bsignals::connection dataAvailableConnection;
 
 	};
 }