Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften/Network/BoostConnectionServer.h
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 /Swiften/Network/BoostConnectionServer.h
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 'Swiften/Network/BoostConnectionServer.h')
-rw-r--r--Swiften/Network/BoostConnectionServer.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/Network/BoostConnectionServer.h b/Swiften/Network/BoostConnectionServer.h
index 3dd9830..917d638 100644
--- a/Swiften/Network/BoostConnectionServer.h
+++ b/Swiften/Network/BoostConnectionServer.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 */
@@ -23,11 +23,11 @@ namespace Swift {
23 public: 23 public:
24 typedef std::shared_ptr<BoostConnectionServer> ref; 24 typedef std::shared_ptr<BoostConnectionServer> ref;
25 25
26 static ref create(int port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) { 26 static ref create(unsigned short port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) {
27 return ref(new BoostConnectionServer(port, ioService, eventLoop)); 27 return ref(new BoostConnectionServer(port, ioService, eventLoop));
28 } 28 }
29 29
30 static ref create(const HostAddress &address, int port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) { 30 static ref create(const HostAddress &address, unsigned short port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) {
31 return ref(new BoostConnectionServer(address, port, ioService, eventLoop)); 31 return ref(new BoostConnectionServer(address, port, ioService, eventLoop));
32 } 32 }
33 33
@@ -40,8 +40,8 @@ namespace Swift {
40 boost::signals2::signal<void (boost::optional<Error>)> onStopped; 40 boost::signals2::signal<void (boost::optional<Error>)> onStopped;
41 41
42 private: 42 private:
43 BoostConnectionServer(int port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop); 43 BoostConnectionServer(unsigned short port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop);
44 BoostConnectionServer(const HostAddress &address, int port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop); 44 BoostConnectionServer(const HostAddress &address, unsigned short port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop);
45 45
46 void stop(boost::optional<Error> e); 46 void stop(boost::optional<Error> e);
47 void acceptNextConnection(); 47 void acceptNextConnection();
@@ -49,7 +49,7 @@ namespace Swift {
49 49
50 private: 50 private:
51 HostAddress address_; 51 HostAddress address_;
52 int port_; 52 unsigned short port_;
53 std::shared_ptr<boost::asio::io_service> ioService_; 53 std::shared_ptr<boost::asio::io_service> ioService_;
54 EventLoop* eventLoop; 54 EventLoop* eventLoop;
55 boost::asio::ip::tcp::acceptor* acceptor_; 55 boost::asio::ip::tcp::acceptor* acceptor_;