1 files changed, 29 insertions, 9 deletions
diff --git a/Slimber/Server.h b/Slimber/Server.h
index 3ed0a58..3587c50 100644
--- a/Slimber/Server.h
+++ b/Slimber/Server.h
@@ -1,9 +1,11 @@
 #pragma once
 
 #include <boost/shared_ptr.hpp>
+#include <boost/optional.hpp>
 #include <vector>
 
 #include "Swiften/Network/BoostIOServiceThread.h"
+#include "Swiften/Network/BoostConnectionServer.h"
 #include "Swiften/Server/UserRegistry.h"
 #include "Swiften/Base/IDGenerator.h"
 #include "Swiften/Server/ServerFromClientSession.h"
@@ -11,11 +13,13 @@
 #include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
 #include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h"
 #include "Swiften/LinkLocal/LinkLocalServiceInfo.h"
+#include "Slimber/ServerError.h"
 
 namespace Swift {
 	class DNSSDServiceID;
 	class String;
 	class VCardCollection;
+	class LinkLocalConnector;
 	class LinkLocalServiceBrowser;
 	class LinkLocalPresenceManager;
 	class BoostConnectionServer;
@@ -32,9 +36,23 @@ namespace Swift {
 					VCardCollection* vCardCollection);
 			~Server();
 
+			void start();
+			void stop();
+
+			int getLinkLocalPort() const {
+				return linkLocalConnectionPort;
+			}
+
+			int getClientToServerPort() const {
+				return clientConnectionPort;
+			}
+
 			boost::signal<void (bool)> onSelfConnected;
+			boost::signal<void (boost::optional<ServerError>)> onStopped;
 
 		private:
+			void stop(boost::optional<ServerError>);
+
 			void handleNewClientConnection(boost::shared_ptr<Connection> c);
 			void handleSessionStarted();
 			void handleSessionFinished(boost::shared_ptr<ServerFromClientSession>);
@@ -42,16 +60,17 @@ namespace Swift {
 			void handleRosterChanged(boost::shared_ptr<RosterPayload> roster);
 			void handlePresenceChanged(boost::shared_ptr<Presence> presence);
 			void handleServiceRegistered(const DNSSDServiceID& service);
-/*
 			void handleNewLinkLocalConnection(boost::shared_ptr<Connection> connection);
 			void handleLinkLocalSessionFinished(boost::shared_ptr<Session> session);
 			void handleLinkLocalElementReceived(boost::shared_ptr<Element> element, boost::shared_ptr<Session> session);
 			void handleConnectFinished(boost::shared_ptr<LinkLocalConnector> connector, bool error);
-			void registerLinkLocalSession(boost::shared_ptr<Session> session);
+			void handleClientConnectionServerStopped(
+					boost::optional<BoostConnectionServer::Error>);
+			void handleLinkLocalConnectionServerStopped(
+					boost::optional<BoostConnectionServer::Error>);
 			boost::shared_ptr<Session> getLinkLocalSessionForJID(const JID& jid);
 			boost::shared_ptr<LinkLocalConnector> getLinkLocalConnectorForJID(const JID& jid);
-			*/
-
+			void registerLinkLocalSession(boost::shared_ptr<Session> session);
 			void unregisterService();
 			LinkLocalServiceInfo getLinkLocalServiceInfo(boost::shared_ptr<Presence> presence);
 
@@ -78,15 +97,16 @@ namespace Swift {
 			LinkLocalServiceBrowser* linkLocalServiceBrowser;
 			VCardCollection* vCardCollection;
 			LinkLocalPresenceManager* presenceManager;
+			bool stopping;
 			boost::shared_ptr<BoostConnectionServer> serverFromClientConnectionServer;
+			std::vector<boost::bsignals::connection> serverFromClientConnectionServerSignalConnections;
 			boost::shared_ptr<ServerFromClientSession> serverFromClientSession;
 			boost::shared_ptr<Presence> lastPresence;
 			JID selfJID;
-			/*
-			boost::shared_ptr<BoostConnectionServer> serverFromNetworkConnectionServer_;
-			std::vector< boost::shared_ptr<Session> > linkLocalSessions_;
-			std::vector< boost::shared_ptr<LinkLocalConnector> > connectors_;
-*/
+			boost::shared_ptr<BoostConnectionServer> serverFromNetworkConnectionServer;
+			std::vector<boost::bsignals::connection> serverFromNetworkConnectionServerSignalConnections;
+			std::vector< boost::shared_ptr<Session> > linkLocalSessions;
+			std::vector< boost::shared_ptr<LinkLocalConnector> > connectors;
 			std::vector< boost::shared_ptr<SessionTracer> > tracers;
 	};
 }