1 files changed, 43 insertions, 8 deletions
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamRegistry.h b/Swiften/FileTransfer/SOCKS5BytestreamRegistry.h
index 7cee256..779aabb 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamRegistry.h
+++ b/Swiften/FileTransfer/SOCKS5BytestreamRegistry.h
@@ -7,23 +7,58 @@
 #pragma once
 
 #include <boost/shared_ptr.hpp>
-#include <map>
 
+#include <map>
 #include <string>
-#include "Swiften/FileTransfer/ReadBytestream.h"
+#include <vector>
+#include <set>
+
+#include <Swiften/Base/IDGenerator.h>
+#include <Swiften/JID/JID.h>
+#include <Swiften/Elements/S5BProxyRequest.h>
+#include <Swiften/FileTransfer/ReadBytestream.h>
+#include <Swiften/FileTransfer/WriteBytestream.h>
+#include <Swiften/FileTransfer/SOCKS5BytestreamServerSession.h>
+#include <Swiften/FileTransfer/SOCKS5BytestreamClientSession.h>
+#include <Swiften/Network/HostAddressPort.h>
 
 namespace Swift {
 	class SOCKS5BytestreamRegistry {
 		public:
 			SOCKS5BytestreamRegistry();
 
-			boost::shared_ptr<ReadBytestream> getBytestream(const std::string& destination) const;
-			void addBytestream(const std::string& destination, boost::shared_ptr<ReadBytestream> byteStream);
-			void removeBytestream(const std::string& destination);
+			boost::shared_ptr<ReadBytestream> getReadBytestream(const std::string& destination) const;
+			void addReadBytestream(const std::string& destination, boost::shared_ptr<ReadBytestream> byteStream);
+			void removeReadBytestream(const std::string& destination);
+
+			boost::shared_ptr<WriteBytestream> getWriteBytestream(const std::string& destination) const;
+			void addWriteBytestream(const std::string& destination, boost::shared_ptr<WriteBytestream> byteStream);
+			void removeWriteBytestream(const std::string& destination);
+
+			/**
+			 * Generate a new session ID to use for new S5B streams.
+			 */
+			std::string generateSessionID();
+
+			/**
+			 *	Start an actual transfer.
+			 */
+			SOCKS5BytestreamServerSession* getConnectedSession(const std::string& destination);
+
+		public:
+			static std::string getHostname(const std::string& sessionID, const JID& requester, const JID& target);
 
 		private:
-			typedef std::map<std::string, boost::shared_ptr<ReadBytestream> > BytestreamMap;
-			BytestreamMap byteStreams;
+			friend class SOCKS5BytestreamServerSession;
+
+			typedef std::map<std::string, boost::shared_ptr<ReadBytestream> > ReadBytestreamMap;
+			ReadBytestreamMap readBytestreams;
+
+			typedef std::map<std::string, boost::shared_ptr<WriteBytestream> > WriteBytestreamMap;
+			WriteBytestreamMap writeBytestreams;
+
+			std::map<std::string, SOCKS5BytestreamServerSession*> serverSessions;
+
+			IDGenerator idGenerator;
 	};
 }
-