diff options
Diffstat (limited to 'Slimber')
| -rw-r--r-- | Slimber/Server.cpp | 6 | ||||
| -rw-r--r-- | Slimber/Server.h | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Slimber/Server.cpp b/Slimber/Server.cpp index 3bc3112..bfa34f5 100644 --- a/Slimber/Server.cpp +++ b/Slimber/Server.cpp @@ -1,11 +1,11 @@ /* - * Copyright (c) 2010-2016 Isode Limited. + * Copyright (c) 2010-2018 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #include <Slimber/Server.h> #include <cassert> #include <string> @@ -33,20 +33,20 @@ #include <Limber/Server/ServerFromClientSession.h> #include <Limber/Server/UserRegistry.h> #include <Slimber/LinkLocalPresenceManager.h> #include <Slimber/VCardCollection.h> namespace Swift { Server::Server( - int clientConnectionPort, - int linkLocalConnectionPort, + unsigned short clientConnectionPort, + unsigned short linkLocalConnectionPort, LinkLocalServiceBrowser* linkLocalServiceBrowser, VCardCollection* vCardCollection, EventLoop* eventLoop) : linkLocalServiceRegistered(false), rosterRequested(false), clientConnectionPort(clientConnectionPort), linkLocalConnectionPort(linkLocalConnectionPort), linkLocalServiceBrowser(linkLocalServiceBrowser), vCardCollection(vCardCollection), diff --git a/Slimber/Server.h b/Slimber/Server.h index 4842cd9..2ee5a4a 100644 --- a/Slimber/Server.h +++ b/Slimber/Server.h @@ -1,11 +1,11 @@ /* - * Copyright (c) 2010-2016 Isode Limited. + * Copyright (c) 2010-2018 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ #pragma once #include <memory> #include <vector> @@ -35,33 +35,33 @@ namespace Swift { class BoostConnectionServer; class SessionTracer; class RosterPayload; class Presence; class EventLoop; class Server { public: Server( - int clientConnectionPort, - int linkLocalConnectionPort, + unsigned short clientConnectionPort, + unsigned short linkLocalConnectionPort, LinkLocalServiceBrowser* browser, VCardCollection* vCardCollection, EventLoop* eventLoop); ~Server(); void start(); void stop(); - int getLinkLocalPort() const { + unsigned short getLinkLocalPort() const { return linkLocalConnectionPort; } - int getClientToServerPort() const { + unsigned short getClientToServerPort() const { return clientConnectionPort; } boost::signals2::signal<void (bool)> onSelfConnected; boost::signals2::signal<void (boost::optional<ServerError>)> onStopped; private: void stop(boost::optional<ServerError>); @@ -99,20 +99,20 @@ namespace Swift { private: IDGenerator idGenerator; FullPayloadParserFactoryCollection payloadParserFactories; FullPayloadSerializerCollection payloadSerializers; BoostIOServiceThread boostIOServiceThread; DummyUserRegistry userRegistry; PlatformXMLParserFactory xmlParserFactory; bool linkLocalServiceRegistered; bool rosterRequested; - int clientConnectionPort; - int linkLocalConnectionPort; + unsigned short clientConnectionPort; + unsigned short linkLocalConnectionPort; LinkLocalServiceBrowser* linkLocalServiceBrowser; VCardCollection* vCardCollection; EventLoop* eventLoop; LinkLocalPresenceManager* presenceManager; bool stopping; std::shared_ptr<BoostConnectionServer> serverFromClientConnectionServer; std::vector<boost::signals2::connection> serverFromClientConnectionServerSignalConnections; std::shared_ptr<ServerFromClientSession> serverFromClientSession; std::shared_ptr<Presence> lastPresence; |
Swift