1 files changed, 9 insertions, 9 deletions
diff --git a/Swiften/Network/BOSHConnection.h b/Swiften/Network/BOSHConnection.h
index 4d53253..d9fa016 100644
--- a/Swiften/Network/BOSHConnection.h
+++ b/Swiften/Network/BOSHConnection.h
@@ -10,35 +10,35 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 
 #pragma once
 
 #include <boost/enable_shared_from_this.hpp>
 
 #include <Swiften/Network/Connection.h>
+#include <Swiften/Network/Connector.h>
 #include <Swiften/Network/HostAddressPort.h>
 #include <Swiften/Base/String.h>
 #include <Swiften/Base/URL.h>
 #include <Swiften/Base/Error.h>
 #include <Swiften/Session/SessionStream.h>
 
 namespace boost {
 	class thread;
 	namespace system {
 		class error_code;
 	}
 }
 
 class BOSHConnectionTest;
 
 namespace Swift {
-	class ConnectionFactory;
 	class XMLParserFactory;
 	class TLSContextFactory;
 
 		class BOSHError : public SessionStream::Error {
 				public:
 					enum Type {BadRequest, HostGone, HostUnknown, ImproperAddressing, 
 						  InternalServerError, ItemNotFound, OtherRequest, PolicyViolation, 
 						  RemoteConnectionFailed, RemoteStreamError, SeeOtherURI, SystemShutdown, UndefinedCondition,
 						  NoError};
@@ -48,60 +48,60 @@ namespace Swift {
 				private:
 					Type type;
 					
 			};
 
 
 	class BOSHConnection : public boost::enable_shared_from_this<BOSHConnection> {
 		public:
 			typedef boost::shared_ptr<BOSHConnection> ref;
-			static ref create(const URL& boshURL, ConnectionFactory* connectionFactory, XMLParserFactory* parserFactory, TLSContextFactory* tlsFactory) {
-				return ref(new BOSHConnection(boshURL, connectionFactory, parserFactory, tlsFactory));
+			static ref create(const URL& boshURL, Connector::ref connector, XMLParserFactory* parserFactory) {
+				return ref(new BOSHConnection(boshURL, connector, parserFactory));
 			}
 			virtual ~BOSHConnection();
 			virtual void connect();
 			virtual void disconnect();
 			virtual void write(const SafeByteArray& data);
 
 			const std::string& getSID();
 			void setRID(unsigned long long rid);
 			void setSID(const std::string& sid);
-			void startStream(const std::string& to, unsigned long rid);
+			void startStream(const std::string& to, unsigned long long rid);
 			void terminateStream();
 			bool isReadyToSend();
 			void restartStream();
 
 
 			boost::signal<void (bool /* error */)> onConnectFinished;
 			boost::signal<void (bool /* error */)> onDisconnected;
 			boost::signal<void (BOSHError::ref)> onSessionTerminated;
 			boost::signal<void (const std::string& /*sid*/, size_t /*requests*/)> onSessionStarted;
 			boost::signal<void (const SafeByteArray&)> onXMPPDataRead;
 			boost::signal<void (const SafeByteArray&)> onBOSHDataRead;
 			boost::signal<void (const SafeByteArray&)> onBOSHDataWritten;
 			boost::signal<void (const std::string&)> onHTTPError;
 
 		private:
 			friend class ::BOSHConnectionTest;
 
-			BOSHConnection(const URL& boshURL, ConnectionFactory* connectionFactory, XMLParserFactory* parserFactory, TLSContextFactory* tlsFactory);
+			BOSHConnection(const URL& boshURL, Connector::ref connector, XMLParserFactory* parserFactory);
 
-			static std::pair<SafeByteArray, size_t> createHTTPRequest(const SafeByteArray& data, bool streamRestart, bool terminate, long rid, const std::string& sid, const URL& boshURL);
-			void handleConnectionConnectFinished(bool error);
+			static std::pair<SafeByteArray, size_t> createHTTPRequest(const SafeByteArray& data, bool streamRestart, bool terminate, unsigned long long rid, const std::string& sid, const URL& boshURL);
+			void handleConnectFinished(Connection::ref);
 			void handleDataRead(boost::shared_ptr<SafeByteArray> data);
 			void handleDisconnected(const boost::optional<Connection::Error>& error);
 			void write(const SafeByteArray& data, bool streamRestart, bool terminate); /* FIXME: refactor */
 			BOSHError::Type parseTerminationCondition(const std::string& text);
+			void cancelConnector();
 
 			URL boshURL_;
-			ConnectionFactory* connectionFactory_;
+			Connector::ref connector_;
 			XMLParserFactory* parserFactory_;
 			boost::shared_ptr<Connection> connection_;
 			std::string sid_;
 			bool waitingForStartResponse_;
 			unsigned long long rid_;
 			SafeByteArray buffer_;
 			bool pending_;
-			TLSContextFactory* tlsFactory_;
 			bool connectionReady_;
 	};
 }