summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdwin Mons <edwin.mons@isode.com>2018-10-29 16:28:14 (GMT)
committerEdwin Mons <edwin.mons@isode.com>2018-11-08 11:31:20 (GMT)
commitcf3d517763a3d74a2ec9fd6f7bdee8cbaee3550f (patch)
tree69e11e13ff2e5127d2cbfcc164be761cf104a1b2 /Slimber
parent5ce9e19ef0744f530a797c30a82e9723eb7ea306 (diff)
downloadswift-cf3d517763a3d74a2ec9fd6f7bdee8cbaee3550f.zip
swift-cf3d517763a3d74a2ec9fd6f7bdee8cbaee3550f.tar.bz2
Consistently use unsigned short for network ports
Network ports are now consistently stored as unsigned shorts, apart from the options and user interface, where -1 is still used to denote the use of default ports. Test-Information: Unit tests pass on macOS 10.13 and Debian 9 On macOS: tested the UI with various proxy and manual ports, behaviour as expected. Change-Id: I7a65f40083022887aa30ed7b21eadc56d0c52be1
Diffstat (limited to 'Slimber')
-rw-r--r--Slimber/Server.cpp6
-rw-r--r--Slimber/Server.h14
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,5 +1,5 @@
/*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -39,8 +39,8 @@
namespace Swift {
Server::Server(
- int clientConnectionPort,
- int linkLocalConnectionPort,
+ unsigned short clientConnectionPort,
+ unsigned short linkLocalConnectionPort,
LinkLocalServiceBrowser* linkLocalServiceBrowser,
VCardCollection* vCardCollection,
EventLoop* eventLoop) :
diff --git a/Slimber/Server.h b/Slimber/Server.h
index 4842cd9..2ee5a4a 100644
--- a/Slimber/Server.h
+++ b/Slimber/Server.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -41,8 +41,8 @@ namespace Swift {
class Server {
public:
Server(
- int clientConnectionPort,
- int linkLocalConnectionPort,
+ unsigned short clientConnectionPort,
+ unsigned short linkLocalConnectionPort,
LinkLocalServiceBrowser* browser,
VCardCollection* vCardCollection,
EventLoop* eventLoop);
@@ -51,11 +51,11 @@ namespace Swift {
void start();
void stop();
- int getLinkLocalPort() const {
+ unsigned short getLinkLocalPort() const {
return linkLocalConnectionPort;
}
- int getClientToServerPort() const {
+ unsigned short getClientToServerPort() const {
return clientConnectionPort;
}
@@ -105,8 +105,8 @@ namespace Swift {
PlatformXMLParserFactory xmlParserFactory;
bool linkLocalServiceRegistered;
bool rosterRequested;
- int clientConnectionPort;
- int linkLocalConnectionPort;
+ unsigned short clientConnectionPort;
+ unsigned short linkLocalConnectionPort;
LinkLocalServiceBrowser* linkLocalServiceBrowser;
VCardCollection* vCardCollection;
EventLoop* eventLoop;