Swiftdiff options
| author | Edwin Mons <edwin.mons@isode.com> | 2018-10-29 16:28:14 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2018-11-08 11:31:20 (GMT) |
| commit | cf3d517763a3d74a2ec9fd6f7bdee8cbaee3550f (patch) | |
| tree | 69e11e13ff2e5127d2cbfcc164be761cf104a1b2 /Swiften/Network/HostAddressPort.h | |
| parent | 5ce9e19ef0744f530a797c30a82e9723eb7ea306 (diff) | |
| download | swift-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/HostAddressPort.h')
| -rw-r--r-- | Swiften/Network/HostAddressPort.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Network/HostAddressPort.h b/Swiften/Network/HostAddressPort.h index e42e1d1..14c7c66 100644 --- a/Swiften/Network/HostAddressPort.h +++ b/Swiften/Network/HostAddressPort.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010 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 | */ |
| @@ -14,14 +14,14 @@ | |||
| 14 | namespace Swift { | 14 | namespace Swift { |
| 15 | class SWIFTEN_API HostAddressPort { | 15 | class SWIFTEN_API HostAddressPort { |
| 16 | public: | 16 | public: |
| 17 | HostAddressPort(const HostAddress& address = HostAddress(), int port = -1); | 17 | HostAddressPort(const HostAddress& address = HostAddress(), unsigned short port = 0); |
| 18 | HostAddressPort(const boost::asio::ip::tcp::endpoint& endpoint); | 18 | HostAddressPort(const boost::asio::ip::tcp::endpoint& endpoint); |
| 19 | 19 | ||
| 20 | const HostAddress& getAddress() const { | 20 | const HostAddress& getAddress() const { |
| 21 | return address_; | 21 | return address_; |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | int getPort() const { | 24 | unsigned short getPort() const { |
| 25 | return port_; | 25 | return port_; |
| 26 | } | 26 | } |
| 27 | 27 | ||
| @@ -37,6 +37,6 @@ namespace Swift { | |||
| 37 | 37 | ||
| 38 | private: | 38 | private: |
| 39 | HostAddress address_; | 39 | HostAddress address_; |
| 40 | int port_; | 40 | unsigned short port_; |
| 41 | }; | 41 | }; |
| 42 | } | 42 | } |