1 files changed, 1 insertions, 2 deletions
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp b/Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp
index a38501b..4fc0246 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp
+++ b/Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp
@@ -1,38 +1,38 @@
 /*
  * Copyright (c) 2011 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
 /*
- * Copyright (c) 2013-2015 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include "SOCKS5BytestreamClientSession.h"
 
 #include <boost/bind.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
 #include <Swiften/Base/Algorithm.h>
 #include <Swiften/Base/ByteArray.h>
 #include <Swiften/Base/Concat.h>
 #include <Swiften/Base/Log.h>
 #include <Swiften/Base/SafeByteArray.h>
 #include <Swiften/FileTransfer/BytestreamException.h>
 #include <Swiften/Network/TimerFactory.h>
 #include <Swiften/StringCodecs/Hexify.h>
 
 namespace Swift {
 
 SOCKS5BytestreamClientSession::SOCKS5BytestreamClientSession(
 		boost::shared_ptr<Connection> connection, 
 		const HostAddressPort& addressPort, 
 		const std::string& destination, 
 		TimerFactory* timerFactory) :
 			connection(connection), 
 			addressPort(addressPort), 
 			destination(destination), 
 			state(Initial), 
 			chunkSize(131072) {
@@ -139,61 +139,60 @@ void SOCKS5BytestreamClientSession::process() {
 			SWIFT_LOG(debug) << "Data: " << Hexify::hexify(unprocessedData) << std::endl;
 			unprocessedData.clear();
 			//assert(false);
 	}
 }
 
 void SOCKS5BytestreamClientSession::hello() {
 	// Version 5, 1 auth method, No authentication
 	const SafeByteArray hello = createSafeByteArray("\x05\x01\x00", 3);
 	connection->write(hello);
 	state = Hello;
 }
 
 void SOCKS5BytestreamClientSession::authenticate() {
 	SWIFT_LOG(debug) << std::endl;
 	SafeByteArray header = createSafeByteArray("\x05\x01\x00\x03", 4);
 	SafeByteArray message = header;
 	append(message, createSafeByteArray(boost::numeric_cast<char>(destination.size())));
 	authenticateAddress = createByteArray(destination);
 	append(message, authenticateAddress);
 	append(message, createSafeByteArray("\x00\x00", 2)); // 2 byte for port
 	connection->write(message);
 	state = Authenticating;
 }
 
 void SOCKS5BytestreamClientSession::startReceiving(boost::shared_ptr<WriteBytestream> writeStream) {
 	if (state == Ready) {
 		state = Reading;
 		writeBytestream = writeStream;
 		writeBytestream->write(unprocessedData);
-		//onBytesReceived(unprocessedData.size());
 		unprocessedData.clear();
 	} else {
 		SWIFT_LOG(debug) << "Session isn't ready for transfer yet!" << std::endl;
 	}
 }
 
 void SOCKS5BytestreamClientSession::startSending(boost::shared_ptr<ReadBytestream> readStream) {
 	if (state == Ready) {
 		state = Writing;
 		readBytestream = readStream;
 		dataWrittenConnection = connection->onDataWritten.connect(
 				boost::bind(&SOCKS5BytestreamClientSession::sendData, this));
 		sendData();
 	} else {
 		SWIFT_LOG(debug) << "Session isn't ready for transfer yet!" << std::endl;
 	}
 }
 
 HostAddressPort SOCKS5BytestreamClientSession::getAddressPort() const {
 	return addressPort;
 }
 
 void SOCKS5BytestreamClientSession::sendData() {
 	if (!readBytestream->isFinished()) {
 		try {
 			boost::shared_ptr<ByteArray> dataToSend = readBytestream->read(boost::numeric_cast<size_t>(chunkSize));
 			connection->write(createSafeByteArray(*dataToSend));
 			onBytesSent(dataToSend->size());
 		}
 		catch (const BytestreamException&) {