Swift
summaryrefslogtreecommitdiffstats
path: root/Slimber
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 @@
1/* 1/*
2 * Copyright (c) 2010-2016 Isode Limited. 2 * Copyright (c) 2010-2018 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -39,8 +39,8 @@
39namespace Swift { 39namespace Swift {
40 40
41Server::Server( 41Server::Server(
42 int clientConnectionPort, 42 unsigned short clientConnectionPort,
43 int linkLocalConnectionPort, 43 unsigned short linkLocalConnectionPort,
44 LinkLocalServiceBrowser* linkLocalServiceBrowser, 44 LinkLocalServiceBrowser* linkLocalServiceBrowser,
45 VCardCollection* vCardCollection, 45 VCardCollection* vCardCollection,
46 EventLoop* eventLoop) : 46 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 @@
1/* 1/*
2 * Copyright (c) 2010-2016 Isode Limited. 2 * Copyright (c) 2010-2018 Isode Limited.
3 * All rights reserved. 3 * All rights reserved.
4 * See the COPYING file for more information. 4 * See the COPYING file for more information.
5 */ 5 */
@@ -41,8 +41,8 @@ namespace Swift {
41 class Server { 41 class Server {
42 public: 42 public:
43 Server( 43 Server(
44 int clientConnectionPort, 44 unsigned short clientConnectionPort,
45 int linkLocalConnectionPort, 45 unsigned short linkLocalConnectionPort,
46 LinkLocalServiceBrowser* browser, 46 LinkLocalServiceBrowser* browser,
47 VCardCollection* vCardCollection, 47 VCardCollection* vCardCollection,
48 EventLoop* eventLoop); 48 EventLoop* eventLoop);
@@ -51,11 +51,11 @@ namespace Swift {
51 void start(); 51 void start();
52 void stop(); 52 void stop();
53 53
54 int getLinkLocalPort() const { 54 unsigned short getLinkLocalPort() const {
55 return linkLocalConnectionPort; 55 return linkLocalConnectionPort;
56 } 56 }
57 57
58 int getClientToServerPort() const { 58 unsigned short getClientToServerPort() const {
59 return clientConnectionPort; 59 return clientConnectionPort;
60 } 60 }
61 61
@@ -105,8 +105,8 @@ namespace Swift {
105 PlatformXMLParserFactory xmlParserFactory; 105 PlatformXMLParserFactory xmlParserFactory;
106 bool linkLocalServiceRegistered; 106 bool linkLocalServiceRegistered;
107 bool rosterRequested; 107 bool rosterRequested;
108 int clientConnectionPort; 108 unsigned short clientConnectionPort;
109 int linkLocalConnectionPort; 109 unsigned short linkLocalConnectionPort;
110 LinkLocalServiceBrowser* linkLocalServiceBrowser; 110 LinkLocalServiceBrowser* linkLocalServiceBrowser;
111 VCardCollection* vCardCollection; 111 VCardCollection* vCardCollection;
112 EventLoop* eventLoop; 112 EventLoop* eventLoop;